Merge branch 'frozen-string-app-controller-more' into 'master'

Enable more frozen string in app/controllers/

See merge request gitlab-org/gitlab-ce!21873

app/controllers/dashboard/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::ApplicationController < ApplicationController
   include ControllerWithCrossProjectAccessCheck
 

app/controllers/dashboard/groups_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::GroupsController < Dashboard::ApplicationController
   include GroupTree
 

app/controllers/dashboard/labels_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::LabelsController < Dashboard::ApplicationController
   def index
     respond_to do |format|

app/controllers/dashboard/milestones_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::MilestonesController < Dashboard::ApplicationController
   include MilestoneActions
 

app/controllers/dashboard/projects_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::ProjectsController < Dashboard::ApplicationController
   include ParamsBackwardCompatibility
   include RendersMemberAccess

app/controllers/dashboard/snippets_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::SnippetsController < Dashboard::ApplicationController
   skip_cross_project_access_check :index
 

app/controllers/dashboard/todos_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dashboard::TodosController < Dashboard::ApplicationController
   include ActionView::Helpers::NumberHelper
 

app/controllers/explore/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Explore::ApplicationController < ApplicationController
   skip_before_action :authenticate_user!
 

app/controllers/explore/groups_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Explore::GroupsController < Explore::ApplicationController
   include GroupTree
 

app/controllers/explore/projects_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Explore::ProjectsController < Explore::ApplicationController
   include ParamsBackwardCompatibility
   include RendersMemberAccess

app/controllers/explore/snippets_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Explore::SnippetsController < Explore::ApplicationController
   def index
     @snippets = SnippetsFinder.new(current_user).execute

app/controllers/google_api/authorizations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GoogleApi
   class AuthorizationsController < ApplicationController
     def callback

app/controllers/groups/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::ApplicationController < ApplicationController
   include RoutableActions
   include ControllerWithCrossProjectAccessCheck

app/controllers/groups/avatars_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::AvatarsController < Groups::ApplicationController
   before_action :authorize_admin_group!
 

app/controllers/groups/boards_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::BoardsController < Groups::ApplicationController
   include BoardsResponses
 

app/controllers/groups/children_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Groups
   class ChildrenController < Groups::ApplicationController
     before_action :group

app/controllers/groups/group_members_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::GroupMembersController < Groups::ApplicationController
   include MembershipActions
   include MembersPresentation

app/controllers/groups/labels_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::LabelsController < Groups::ApplicationController
   include ToggleSubscriptionAction
 

app/controllers/groups/milestones_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::MilestonesController < Groups::ApplicationController
   include MilestoneActions
 

app/controllers/groups/runners_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::RunnersController < Groups::ApplicationController
   # Proper policies should be implemented per
   # https://gitlab.com/gitlab-org/gitlab-ce/issues/45894

app/controllers/groups/settings/ci_cd_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Groups
   module Settings
     class CiCdController < Groups::ApplicationController

app/controllers/groups/shared_projects_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Groups
   class SharedProjectsController < Groups::ApplicationController
     respond_to :json

app/controllers/groups/uploads_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Groups::UploadsController < Groups::ApplicationController
   include UploadsActions
   include WorkhorseRequest

app/controllers/groups/variables_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Groups
   class VariablesController < Groups::ApplicationController
     before_action :authorize_admin_build!

app/controllers/import/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::BaseController < ApplicationController
   private
 

app/controllers/import/bitbucket_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::BitbucketController < Import::BaseController
   before_action :verify_bitbucket_import_enabled
   before_action :bitbucket_auth, except: :callback

app/controllers/import/fogbugz_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::FogbugzController < Import::BaseController
   before_action :verify_fogbugz_import_enabled
   before_action :user_map, only: [:new_user_map, :create_user_map]

app/controllers/import/gitea_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::GiteaController < Import::GithubController
   def new
     if session[access_token_key].present? && session[host_key].present?

app/controllers/import/github_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::GithubController < Import::BaseController
   before_action :verify_import_enabled
   before_action :provider_auth, only: [:status, :jobs, :create]

app/controllers/import/gitlab_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::GitlabController < Import::BaseController
   MAX_PROJECT_PAGES = 15
   PER_PAGE_PROJECTS = 100

app/controllers/import/gitlab_projects_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::GitlabProjectsController < Import::BaseController
   before_action :whitelist_query_limiting, only: [:create]
   before_action :verify_gitlab_project_import_enabled

app/controllers/import/google_code_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::GoogleCodeController < Import::BaseController
   before_action :verify_google_code_import_enabled
   before_action :user_map, only: [:new_user_map, :create_user_map]

app/controllers/import/manifest_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import::ManifestController < Import::BaseController
   before_action :whitelist_query_limiting, only: [:create]
   before_action :verify_import_enabled

app/controllers/ldap/omniauth_callbacks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
   extend ::Gitlab::Utils::Override
 

app/controllers/oauth/applications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   include Gitlab::GonHelper
   include Gitlab::Allowable

app/controllers/oauth/authorizations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   layout 'profile'
 

app/controllers/oauth/authorized_applications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
   include PageLayoutHelper
 

app/controllers/profiles/accounts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::AccountsController < Profiles::ApplicationController
   include AuthHelper
 

app/controllers/profiles/active_sessions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::ActiveSessionsController < Profiles::ApplicationController
   def index
     @sessions = ActiveSession.list(current_user)

app/controllers/profiles/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::ApplicationController < ApplicationController
   layout 'profile'
 end

app/controllers/profiles/avatars_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::AvatarsController < Profiles::ApplicationController
   def destroy
     @user = current_user

app/controllers/profiles/chat_names_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::ChatNamesController < Profiles::ApplicationController
   before_action :chat_name_token, only: [:new]
   before_action :chat_name_params, only: [:new, :create, :deny]

app/controllers/profiles/emails_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::EmailsController < Profiles::ApplicationController
   before_action :find_email, only: [:destroy, :resend_confirmation_instructions]
 

app/controllers/profiles/gpg_keys_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::GpgKeysController < Profiles::ApplicationController
   before_action :set_gpg_key, only: [:destroy, :revoke]
 

app/controllers/profiles/keys_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::KeysController < Profiles::ApplicationController
   skip_before_action :authenticate_user!, only: [:get_keys]
 

app/controllers/profiles/notifications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::NotificationsController < Profiles::ApplicationController
   # rubocop: disable CodeReuse/ActiveRecord
   def show

app/controllers/profiles/passwords_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::PasswordsController < Profiles::ApplicationController
   skip_before_action :check_password_expiration, only: [:new, :create]
   skip_before_action :check_two_factor_requirement, only: [:new, :create]

app/controllers/profiles/personal_access_tokens_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
   def index
     set_index_vars

app/controllers/profiles/preferences_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::PreferencesController < Profiles::ApplicationController
   before_action :user
 

app/controllers/profiles/two_factor_auths_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
   skip_before_action :check_two_factor_requirement
 
@@ -30,7 +32,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
       unless two_factor_grace_period_expired?
         grace_period_deadline = current_user.otp_grace_period_started_at + two_factor_grace_period.hours
-        flash.now[:alert] << " You need to do this before #{l(grace_period_deadline)}."
+        flash.now[:alert] = flash.now[:alert] + " You need to do this before #{l(grace_period_deadline)}."
       end
     end
 

app/controllers/profiles/u2f_registrations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Profiles::U2fRegistrationsController < Profiles::ApplicationController
   def destroy
     u2f_registration = current_user.u2f_registrations.find(params[:id])

changelogs/unreleased/frozen-string-app-controller-more.yml

@@ -0,0 +1,5 @@
+---
+title: Enable more frozen string in app/controllers/
+merge_request:
+author: gfyoung
+type: performance