diff options
| author | gfyoung <gfyoung17@gmail.com> | 2018-09-13 22:42:05 -0700 |
|---|---|---|
| committer | gfyoung <gfyoung17@gmail.com> | 2018-09-18 21:22:45 -0700 |
| commit | 73322a0e551bbbc42d429b15e7ad9fd375ab761d (patch) | |
| tree | cfb28cb2ef99f11dbb055a81db283b8269e2e1ab /app/controllers/confirmations_controller.rb | |
| parent | 2dac058de25dc6ed03d0ed6f8b099aa17cdc1cab (diff) | |
| download | gitlab-ce-73322a0e551bbbc42d429b15e7ad9fd375ab761d.tar.gz | |
Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controller
Enables frozen string for the following:
* app/controllers/*.rb
* app/controllers/admin/**/*.rb
* app/controllers/boards/**/*.rb
* app/controllers/ci/**/*.rb
* app/controllers/concerns/**/*.rb
Partially addresses #47424.
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/confirmations_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 7bc46a6ccc0..2c4aab67448 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ConfirmationsController < Devise::ConfirmationsController include AcceptsPendingInvitations @@ -20,7 +22,7 @@ class ConfirmationsController < Devise::ConfirmationsController after_sign_in(resource) else Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}") - flash[:notice] += " Please sign in." + flash[:notice] = flash[:notice] + " Please sign in." new_session_path(:user, anchor: 'login-pane') end end |