From 12ee2753c1e27c0c9480a8e79db2463ba51ba3ec Mon Sep 17 00:00:00 2001 From: gfyoung Date: Tue, 25 Sep 2018 20:45:43 -0700 Subject: Enable even more frozen string in app/controllers Enables frozen string for some vestigial files as well as the following: * app/controllers/projects/**/*.rb * app/controllers/sherlock/**/*.rb * app/controllers/snippets/**/*.rb * app/controllers/users/**/*.rb Partially addresses #47424. --- app/controllers/concerns/invalid_utf8_error_handler.rb | 2 ++ app/controllers/projects/application_controller.rb | 2 ++ app/controllers/projects/artifacts_controller.rb | 2 ++ app/controllers/projects/autocomplete_sources_controller.rb | 2 ++ app/controllers/projects/avatars_controller.rb | 2 ++ app/controllers/projects/badges_controller.rb | 2 ++ app/controllers/projects/blame_controller.rb | 2 ++ app/controllers/projects/blob_controller.rb | 2 ++ app/controllers/projects/boards_controller.rb | 2 ++ app/controllers/projects/branches_controller.rb | 2 ++ app/controllers/projects/build_artifacts_controller.rb | 2 ++ app/controllers/projects/builds_controller.rb | 2 ++ app/controllers/projects/ci/lints_controller.rb | 2 ++ app/controllers/projects/clusters/applications_controller.rb | 2 ++ app/controllers/projects/clusters_controller.rb | 2 ++ app/controllers/projects/commit_controller.rb | 2 ++ app/controllers/projects/commits_controller.rb | 2 ++ app/controllers/projects/compare_controller.rb | 2 ++ app/controllers/projects/cycle_analytics/events_controller.rb | 2 ++ app/controllers/projects/cycle_analytics_controller.rb | 2 ++ app/controllers/projects/deploy_keys_controller.rb | 2 ++ app/controllers/projects/deploy_tokens_controller.rb | 2 ++ app/controllers/projects/deployments_controller.rb | 2 ++ app/controllers/projects/discussions_controller.rb | 2 ++ app/controllers/projects/environments_controller.rb | 2 ++ app/controllers/projects/find_file_controller.rb | 2 ++ app/controllers/projects/forks_controller.rb | 2 ++ app/controllers/projects/git_http_client_controller.rb | 2 ++ app/controllers/projects/git_http_controller.rb | 2 ++ app/controllers/projects/graphs_controller.rb | 2 ++ app/controllers/projects/group_links_controller.rb | 2 ++ app/controllers/projects/hook_logs_controller.rb | 2 ++ app/controllers/projects/hooks_controller.rb | 2 ++ app/controllers/projects/imports_controller.rb | 2 ++ app/controllers/projects/issues_controller.rb | 2 ++ app/controllers/projects/jobs_controller.rb | 2 ++ app/controllers/projects/labels_controller.rb | 9 +++------ app/controllers/projects/lfs_api_controller.rb | 2 ++ app/controllers/projects/lfs_locks_api_controller.rb | 2 ++ app/controllers/projects/lfs_storage_controller.rb | 2 ++ app/controllers/projects/mattermosts_controller.rb | 2 ++ .../projects/merge_requests/application_controller.rb | 2 ++ app/controllers/projects/merge_requests/conflicts_controller.rb | 2 ++ app/controllers/projects/merge_requests/creations_controller.rb | 2 ++ app/controllers/projects/merge_requests/diffs_controller.rb | 2 ++ app/controllers/projects/merge_requests_controller.rb | 2 ++ app/controllers/projects/milestones_controller.rb | 9 +++------ app/controllers/projects/mirrors_controller.rb | 2 ++ app/controllers/projects/network_controller.rb | 2 ++ app/controllers/projects/notes_controller.rb | 2 ++ app/controllers/projects/pages_controller.rb | 2 ++ app/controllers/projects/pages_domains_controller.rb | 2 ++ app/controllers/projects/pipeline_schedules_controller.rb | 2 ++ app/controllers/projects/pipelines_controller.rb | 2 ++ app/controllers/projects/pipelines_settings_controller.rb | 2 ++ app/controllers/projects/project_members_controller.rb | 2 ++ app/controllers/projects/prometheus/metrics_controller.rb | 2 ++ app/controllers/projects/protected_branches_controller.rb | 2 ++ app/controllers/projects/protected_refs_controller.rb | 2 ++ app/controllers/projects/protected_tags_controller.rb | 2 ++ app/controllers/projects/raw_controller.rb | 2 ++ app/controllers/projects/refs_controller.rb | 2 ++ app/controllers/projects/registry/application_controller.rb | 2 ++ app/controllers/projects/registry/repositories_controller.rb | 2 ++ app/controllers/projects/registry/tags_controller.rb | 2 ++ app/controllers/projects/releases_controller.rb | 2 ++ app/controllers/projects/repositories_controller.rb | 2 ++ app/controllers/projects/runner_projects_controller.rb | 2 ++ app/controllers/projects/runners_controller.rb | 2 ++ app/controllers/projects/services_controller.rb | 2 ++ app/controllers/projects/settings/ci_cd_controller.rb | 2 ++ app/controllers/projects/settings/integrations_controller.rb | 2 ++ app/controllers/projects/settings/repository_controller.rb | 2 ++ app/controllers/projects/snippets_controller.rb | 2 ++ app/controllers/projects/tags_controller.rb | 2 ++ app/controllers/projects/templates_controller.rb | 2 ++ app/controllers/projects/todos_controller.rb | 2 ++ app/controllers/projects/tree_controller.rb | 2 ++ app/controllers/projects/triggers_controller.rb | 2 ++ app/controllers/projects/uploads_controller.rb | 2 ++ app/controllers/projects/variables_controller.rb | 2 ++ app/controllers/projects/wikis_controller.rb | 2 ++ app/controllers/sherlock/application_controller.rb | 2 ++ app/controllers/sherlock/file_samples_controller.rb | 2 ++ app/controllers/sherlock/queries_controller.rb | 2 ++ app/controllers/sherlock/transactions_controller.rb | 2 ++ app/controllers/snippets/notes_controller.rb | 2 ++ app/controllers/users/terms_controller.rb | 2 ++ .../unreleased/frozen-string-app-controllers-much-more.yml | 5 +++++ 89 files changed, 183 insertions(+), 12 deletions(-) create mode 100644 changelogs/unreleased/frozen-string-app-controllers-much-more.yml diff --git a/app/controllers/concerns/invalid_utf8_error_handler.rb b/app/controllers/concerns/invalid_utf8_error_handler.rb index a7ea0d00a43..44c6d6b0da0 100644 --- a/app/controllers/concerns/invalid_utf8_error_handler.rb +++ b/app/controllers/concerns/invalid_utf8_error_handler.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module InvalidUTF8ErrorHandler extend ActiveSupport::Concern diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 695ffd90a85..a2bdcaefa9b 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ApplicationController < ApplicationController include CookiesHelper include RoutableActions diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index 3e8ffa485dd..bd110d646e5 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ArtifactsController < Projects::ApplicationController include ExtractsPath include RendersBlob diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb index a8f73ed5cb0..7c93cf36862 100644 --- a/app/controllers/projects/autocomplete_sources_controller.rb +++ b/app/controllers/projects/autocomplete_sources_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::AutocompleteSourcesController < Projects::ApplicationController before_action :load_autocomplete_service, except: [:members] diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb index 878c82cd183..1c385c0e15a 100644 --- a/app/controllers/projects/avatars_controller.rb +++ b/app/controllers/projects/avatars_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::AvatarsController < Projects::ApplicationController include SendsBlob diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb index 06ba73d8e8d..c24bf211760 100644 --- a/app/controllers/projects/badges_controller.rb +++ b/app/controllers/projects/badges_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::BadgesController < Projects::ApplicationController layout 'project_settings' before_action :authorize_admin_project!, only: [:index] diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb index 6461eeac11c..9076bdb9f04 100644 --- a/app/controllers/projects/blame_controller.rb +++ b/app/controllers/projects/blame_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Controller for viewing a file's blame class Projects::BlameController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index bfe4e7f934f..92d26a13da9 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Controller for viewing a file's blame class Projects::BlobController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index e7354a9e1f7..77b818347c7 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::BoardsController < Projects::ApplicationController include BoardsResponses include IssuableCollections diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index d14795e787b..b7750f4517b 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::BranchesController < Projects::ApplicationController include ActionView::Helpers::SanitizeHelper include SortingHelper diff --git a/app/controllers/projects/build_artifacts_controller.rb b/app/controllers/projects/build_artifacts_controller.rb index 9e99a84fac7..46449a4aae9 100644 --- a/app/controllers/projects/build_artifacts_controller.rb +++ b/app/controllers/projects/build_artifacts_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::BuildArtifactsController < Projects::ApplicationController include ExtractsPath include RendersBlob diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 230b072dcea..6b3d70cb720 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::BuildsController < Projects::ApplicationController before_action :authorize_read_build! diff --git a/app/controllers/projects/ci/lints_controller.rb b/app/controllers/projects/ci/lints_controller.rb index a2185572a20..2090af0a111 100644 --- a/app/controllers/projects/ci/lints_controller.rb +++ b/app/controllers/projects/ci/lints_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::Ci::LintsController < Projects::ApplicationController before_action :authorize_create_pipeline! diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb index 8c9df51981a..c356f8d2987 100644 --- a/app/controllers/projects/clusters/applications_controller.rb +++ b/app/controllers/projects/clusters/applications_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::Clusters::ApplicationsController < Projects::ApplicationController before_action :cluster before_action :application_class, only: [:create] diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index eb0fad6cbb2..bcdbf48bb35 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ClustersController < Projects::ApplicationController before_action :cluster, except: [:index, :new, :create_gcp, :create_user] before_action :authorize_read_cluster! diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 81f375875b2..00b63f55710 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Controller for a specific Commit # # Not to be confused with CommitsController, plural. diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index cd9c9aa30f1..84a2a461da7 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "base64" class Projects::CommitsController < Projects::ApplicationController diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index cca77903250..c2df7b34f90 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'addressable/uri' class Projects::CompareController < Projects::ApplicationController diff --git a/app/controllers/projects/cycle_analytics/events_controller.rb b/app/controllers/projects/cycle_analytics/events_controller.rb index 26f3c114108..fb43356ff10 100644 --- a/app/controllers/projects/cycle_analytics/events_controller.rb +++ b/app/controllers/projects/cycle_analytics/events_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module CycleAnalytics class EventsController < Projects::ApplicationController diff --git a/app/controllers/projects/cycle_analytics_controller.rb b/app/controllers/projects/cycle_analytics_controller.rb index d1b8fd80c4e..8c071496ba9 100644 --- a/app/controllers/projects/cycle_analytics_controller.rb +++ b/app/controllers/projects/cycle_analytics_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::CycleAnalyticsController < Projects::ApplicationController include ActionView::Helpers::DateHelper include ActionView::Helpers::TextHelper diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index 2555139cd2c..92ef10a9ef5 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::DeployKeysController < Projects::ApplicationController include RepositorySettingsRedirect respond_to :html diff --git a/app/controllers/projects/deploy_tokens_controller.rb b/app/controllers/projects/deploy_tokens_controller.rb index 83abda64fe0..830b1f4fe4a 100644 --- a/app/controllers/projects/deploy_tokens_controller.rb +++ b/app/controllers/projects/deploy_tokens_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::DeployTokensController < Projects::ApplicationController before_action :authorize_admin_project! diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb index 5a2da7274d1..0a009477d61 100644 --- a/app/controllers/projects/deployments_controller.rb +++ b/app/controllers/projects/deployments_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::DeploymentsController < Projects::ApplicationController before_action :authorize_read_environment! before_action :authorize_read_deployment! diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb index efdddb24290..b62606067c0 100644 --- a/app/controllers/projects/discussions_controller.rb +++ b/app/controllers/projects/discussions_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::DiscussionsController < Projects::ApplicationController include NotesHelper include RendersNotes diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index be22950286e..de10783df1a 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::EnvironmentsController < Projects::ApplicationController layout 'project' before_action :authorize_read_environment! diff --git a/app/controllers/projects/find_file_controller.rb b/app/controllers/projects/find_file_controller.rb index cf53ad0a670..c026e9ff332 100644 --- a/app/controllers/projects/find_file_controller.rb +++ b/app/controllers/projects/find_file_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Controller for viewing a repository's file structure class Projects::FindFileController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb index b709edc8f10..7a1700a206a 100644 --- a/app/controllers/projects/forks_controller.rb +++ b/app/controllers/projects/forks_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ForksController < Projects::ApplicationController include ContinueParams diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb index a52814e6e52..d439db97252 100644 --- a/app/controllers/projects/git_http_client_controller.rb +++ b/app/controllers/projects/git_http_client_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file should be identical in GitLab Community Edition and Enterprise Edition class Projects::GitHttpClientController < Projects::ApplicationController diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb index 1dcf837f78e..be708835e30 100644 --- a/app/controllers/projects/git_http_controller.rb +++ b/app/controllers/projects/git_http_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::GitHttpController < Projects::GitHttpClientController include WorkhorseRequest diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb index 475d4c86294..925b6ed9bfd 100644 --- a/app/controllers/projects/graphs_controller.rb +++ b/app/controllers/projects/graphs_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::GraphsController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb index bc5f38f3c2b..7c713c19762 100644 --- a/app/controllers/projects/group_links_controller.rb +++ b/app/controllers/projects/group_links_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::GroupLinksController < Projects::ApplicationController layout 'project_settings' before_action :authorize_admin_project! diff --git a/app/controllers/projects/hook_logs_controller.rb b/app/controllers/projects/hook_logs_controller.rb index 745e89fc843..a7afc3d77a5 100644 --- a/app/controllers/projects/hook_logs_controller.rb +++ b/app/controllers/projects/hook_logs_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::HookLogsController < Projects::ApplicationController include HooksExecution diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index bbf8c7d5cbc..bc84418b79f 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::HooksController < Projects::ApplicationController include HooksExecution diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index 49aa32119ef..e55065c5817 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ImportsController < Projects::ApplicationController include ContinueParams diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 632e498e4ba..4e859de6fde 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::IssuesController < Projects::ApplicationController include RendersNotes include ToggleSubscriptionAction diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 62b74e84c2c..3f85e442be9 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::JobsController < Projects::ApplicationController include SendFileUpload diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 1fd4f0721a7..a0ce3b08d9f 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::LabelsController < Projects::ApplicationController include ToggleSubscriptionAction @@ -138,12 +140,7 @@ class Projects::LabelsController < Projects::ApplicationController end def flash_notice_for(label, group) - notice = ''.html_safe - notice << label.title - notice << ' promoted to ' - notice << view_context.link_to('group label'.html_safe, group_labels_path(group)) - notice << '.' - notice + ''.html_safe + "#{label.title} promoted to " + view_context.link_to('group label'.html_safe, group_labels_path(group)) + '.' end protected diff --git a/app/controllers/projects/lfs_api_controller.rb b/app/controllers/projects/lfs_api_controller.rb index 6d6f88c1075..be40077d389 100644 --- a/app/controllers/projects/lfs_api_controller.rb +++ b/app/controllers/projects/lfs_api_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::LfsApiController < Projects::GitHttpClientController include LfsRequest diff --git a/app/controllers/projects/lfs_locks_api_controller.rb b/app/controllers/projects/lfs_locks_api_controller.rb index 3fff0fd69ae..fc67cd72faa 100644 --- a/app/controllers/projects/lfs_locks_api_controller.rb +++ b/app/controllers/projects/lfs_locks_api_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::LfsLocksApiController < Projects::GitHttpClientController include LfsRequest diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb index 930d9a05c50..babeee48ef3 100644 --- a/app/controllers/projects/lfs_storage_controller.rb +++ b/app/controllers/projects/lfs_storage_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::LfsStorageController < Projects::GitHttpClientController include LfsRequest include WorkhorseRequest diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index 0f6add3e287..085b1bc1498 100644 --- a/app/controllers/projects/mattermosts_controller.rb +++ b/app/controllers/projects/mattermosts_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MattermostsController < Projects::ApplicationController include TriggersHelper include ActionView::Helpers::AssetUrlHelper diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index aa2008722ec..368ee89ff5c 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MergeRequests::ApplicationController < Projects::ApplicationController before_action :check_merge_requests_available! before_action :merge_request diff --git a/app/controllers/projects/merge_requests/conflicts_controller.rb b/app/controllers/projects/merge_requests/conflicts_controller.rb index 366524b0783..ac1969adc6e 100644 --- a/app/controllers/projects/merge_requests/conflicts_controller.rb +++ b/app/controllers/projects/merge_requests/conflicts_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::ApplicationController include IssuableActions diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 2ccb3896857..86583adc6a4 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MergeRequests::CreationsController < Projects::MergeRequests::ApplicationController include DiffForPath include DiffHelper diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index 666e65b6c5e..f816d2917c8 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController include DiffForPath include DiffHelper diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 75a85fafa3f..dfb69de650b 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController include ToggleSubscriptionAction include IssuableActions diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index e2c05171cd6..20998c97730 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MilestonesController < Projects::ApplicationController include Gitlab::Utils::StrongMemoize include MilestoneActions @@ -91,12 +93,7 @@ class Projects::MilestonesController < Projects::ApplicationController end def flash_notice_for(milestone, group) - notice = ''.html_safe - notice << milestone.title - notice << ' promoted to ' - notice << view_context.link_to('group milestone'.html_safe, group_milestone_path(group, milestone.iid)) - notice << '.' - notice + ''.html_safe + "#{milestone.title} promoted to " + view_context.link_to('group milestone'.html_safe, group_milestone_path(group, milestone.iid)) + '.' end def destroy diff --git a/app/controllers/projects/mirrors_controller.rb b/app/controllers/projects/mirrors_controller.rb index 3739608e4c0..78d5faf2326 100644 --- a/app/controllers/projects/mirrors_controller.rb +++ b/app/controllers/projects/mirrors_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::MirrorsController < Projects::ApplicationController include RepositorySettingsRedirect diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb index 35fec229db7..ad2466a8588 100644 --- a/app/controllers/projects/network_controller.rb +++ b/app/controllers/projects/network_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::NetworkController < Projects::ApplicationController include ExtractsPath include ApplicationHelper diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 21e2145b73b..4bac763d000 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::NotesController < Projects::ApplicationController include RendersNotes include NotesActions diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index e1eba4f8327..c1ad6707c97 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::PagesController < Projects::ApplicationController layout 'project_settings' diff --git a/app/controllers/projects/pages_domains_controller.rb b/app/controllers/projects/pages_domains_controller.rb index c29b3c953a6..439ec9b1731 100644 --- a/app/controllers/projects/pages_domains_controller.rb +++ b/app/controllers/projects/pages_domains_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::PagesDomainsController < Projects::ApplicationController layout 'project_settings' diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb index d8adeffd0b2..acf56f0eb6a 100644 --- a/app/controllers/projects/pipeline_schedules_controller.rb +++ b/app/controllers/projects/pipeline_schedules_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::PipelineSchedulesController < Projects::ApplicationController before_action :schedule, except: [:index, :new, :create] diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 5b2091d68f8..53b29d4146e 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::PipelinesController < Projects::ApplicationController before_action :whitelist_query_limiting, only: [:create, :retry] before_action :pipeline, except: [:index, :new, :create, :charts] diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb index 73c613b26f3..192e6d38f36 100644 --- a/app/controllers/projects/pipelines_settings_controller.rb +++ b/app/controllers/projects/pipelines_settings_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::PipelinesSettingsController < Projects::ApplicationController before_action :authorize_admin_pipeline! diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 08d5e377941..8938cfbad54 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ProjectMembersController < Projects::ApplicationController include MembershipActions include MembersPresentation diff --git a/app/controllers/projects/prometheus/metrics_controller.rb b/app/controllers/projects/prometheus/metrics_controller.rb index c6b6243b553..3a9f9aab4a5 100644 --- a/app/controllers/projects/prometheus/metrics_controller.rb +++ b/app/controllers/projects/prometheus/metrics_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Prometheus class MetricsController < Projects::ApplicationController diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index 64954ac9a42..a860be83e95 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ProtectedBranchesController < Projects::ProtectedRefsController protected diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb index cc62ce2f11b..3a3a29ddd0d 100644 --- a/app/controllers/projects/protected_refs_controller.rb +++ b/app/controllers/projects/protected_refs_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ProtectedRefsController < Projects::ApplicationController include RepositorySettingsRedirect diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb index 198c938ff35..01cedba95ac 100644 --- a/app/controllers/projects/protected_tags_controller.rb +++ b/app/controllers/projects/protected_tags_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ProtectedTagsController < Projects::ProtectedRefsController protected diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb index 91cf35bc70b..1dd5d1ff2e8 100644 --- a/app/controllers/projects/raw_controller.rb +++ b/app/controllers/projects/raw_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Controller for viewing a file's raw class Projects::RawController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb index 0fed7f6576c..b97fbe19bbf 100644 --- a/app/controllers/projects/refs_controller.rb +++ b/app/controllers/projects/refs_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::RefsController < Projects::ApplicationController include ExtractsPath include TreeHelper diff --git a/app/controllers/projects/registry/application_controller.rb b/app/controllers/projects/registry/application_controller.rb index a56f9c58726..2f891d78c91 100644 --- a/app/controllers/projects/registry/application_controller.rb +++ b/app/controllers/projects/registry/application_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Registry class ApplicationController < Projects::ApplicationController diff --git a/app/controllers/projects/registry/repositories_controller.rb b/app/controllers/projects/registry/repositories_controller.rb index ef0433795f4..6d60117c37d 100644 --- a/app/controllers/projects/registry/repositories_controller.rb +++ b/app/controllers/projects/registry/repositories_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Registry class RepositoriesController < ::Projects::Registry::ApplicationController diff --git a/app/controllers/projects/registry/tags_controller.rb b/app/controllers/projects/registry/tags_controller.rb index e602aa3f393..567d750caae 100644 --- a/app/controllers/projects/registry/tags_controller.rb +++ b/app/controllers/projects/registry/tags_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Registry class TagsController < ::Projects::Registry::ApplicationController diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb index caf400ecd92..55827075896 100644 --- a/app/controllers/projects/releases_controller.rb +++ b/app/controllers/projects/releases_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ReleasesController < Projects::ApplicationController # Authorize before_action :require_non_empty_project diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index ecb2ece7532..4eeaeb860ee 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::RepositoriesController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/runner_projects_controller.rb b/app/controllers/projects/runner_projects_controller.rb index c098c82081e..cbeb32fd610 100644 --- a/app/controllers/projects/runner_projects_controller.rb +++ b/app/controllers/projects/runner_projects_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::RunnerProjectsController < Projects::ApplicationController before_action :authorize_admin_build! diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb index d118cec977c..91f40b90aa8 100644 --- a/app/controllers/projects/runners_controller.rb +++ b/app/controllers/projects/runners_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::RunnersController < Projects::ApplicationController before_action :authorize_admin_build! before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show] diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index d55046047ae..f1c9d0d0f77 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::ServicesController < Projects::ApplicationController include ServiceParams diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 322ec096ffb..a2d1b7866c2 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Settings class CiCdController < Projects::ApplicationController diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index d9fecfecc40..388fcb32c35 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Settings class IntegrationsController < Projects::ApplicationController diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb index 0d43cdbe417..6d83d24cdb8 100644 --- a/app/controllers/projects/settings/repository_controller.rb +++ b/app/controllers/projects/settings/repository_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Projects module Settings class RepositoryController < Projects::ApplicationController diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 7c03d8ce827..a44acb12bdf 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::SnippetsController < Projects::ApplicationController include RendersNotes include ToggleAwardEmoji diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb index 74bba97987f..c8442ff3592 100644 --- a/app/controllers/projects/tags_controller.rb +++ b/app/controllers/projects/tags_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::TagsController < Projects::ApplicationController include SortingHelper diff --git a/app/controllers/projects/templates_controller.rb b/app/controllers/projects/templates_controller.rb index 52d6fb82093..7ceea4e5b96 100644 --- a/app/controllers/projects/templates_controller.rb +++ b/app/controllers/projects/templates_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::TemplatesController < Projects::ApplicationController before_action :authenticate_user!, :get_template_class diff --git a/app/controllers/projects/todos_controller.rb b/app/controllers/projects/todos_controller.rb index 93fb9da6510..0b11ee9edc0 100644 --- a/app/controllers/projects/todos_controller.rb +++ b/app/controllers/projects/todos_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::TodosController < Projects::ApplicationController include Gitlab::Utils::StrongMemoize include TodosActions diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index ee9b5458282..3fe300dcfc0 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Controller for viewing a repository's file structure class Projects::TreeController < Projects::ApplicationController include ExtractsPath diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb index cb12b707087..f5fdfb8accc 100644 --- a/app/controllers/projects/triggers_controller.rb +++ b/app/controllers/projects/triggers_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::TriggersController < Projects::ApplicationController before_action :authorize_admin_build! before_action :authorize_manage_trigger!, except: [:index, :create] diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index 7a85046164c..4ffcc2ac805 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::UploadsController < Projects::ApplicationController include UploadsActions include WorkhorseRequest diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb index bf09ea7e4d8..bb658bfcc19 100644 --- a/app/controllers/projects/variables_controller.rb +++ b/app/controllers/projects/variables_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::VariablesController < Projects::ApplicationController before_action :authorize_admin_build! diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index da7aeb26a75..8c6d87a421f 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Projects::WikisController < Projects::ApplicationController include PreviewMarkdown include Gitlab::Utils::StrongMemoize diff --git a/app/controllers/sherlock/application_controller.rb b/app/controllers/sherlock/application_controller.rb index 6bdd3568a78..c048254d348 100644 --- a/app/controllers/sherlock/application_controller.rb +++ b/app/controllers/sherlock/application_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Sherlock class ApplicationController < ::ApplicationController before_action :find_transaction diff --git a/app/controllers/sherlock/file_samples_controller.rb b/app/controllers/sherlock/file_samples_controller.rb index 0c3bc100106..900446bb75a 100644 --- a/app/controllers/sherlock/file_samples_controller.rb +++ b/app/controllers/sherlock/file_samples_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Sherlock class FileSamplesController < Sherlock::ApplicationController def show diff --git a/app/controllers/sherlock/queries_controller.rb b/app/controllers/sherlock/queries_controller.rb index 63b26aab1a4..49a25c682b5 100644 --- a/app/controllers/sherlock/queries_controller.rb +++ b/app/controllers/sherlock/queries_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Sherlock class QueriesController < Sherlock::ApplicationController def show diff --git a/app/controllers/sherlock/transactions_controller.rb b/app/controllers/sherlock/transactions_controller.rb index ae4953c3259..46e382e594e 100644 --- a/app/controllers/sherlock/transactions_controller.rb +++ b/app/controllers/sherlock/transactions_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Sherlock class TransactionsController < Sherlock::ApplicationController def index diff --git a/app/controllers/snippets/notes_controller.rb b/app/controllers/snippets/notes_controller.rb index e992afc0026..091bcb1253d 100644 --- a/app/controllers/snippets/notes_controller.rb +++ b/app/controllers/snippets/notes_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Snippets::NotesController < ApplicationController include NotesActions include ToggleAwardEmoji diff --git a/app/controllers/users/terms_controller.rb b/app/controllers/users/terms_controller.rb index 1b1560a2a00..3c16d934b4d 100644 --- a/app/controllers/users/terms_controller.rb +++ b/app/controllers/users/terms_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Users class TermsController < ApplicationController include InternalRedirect diff --git a/changelogs/unreleased/frozen-string-app-controllers-much-more.yml b/changelogs/unreleased/frozen-string-app-controllers-much-more.yml new file mode 100644 index 00000000000..6e32d5ba039 --- /dev/null +++ b/changelogs/unreleased/frozen-string-app-controllers-much-more.yml @@ -0,0 +1,5 @@ +--- +title: Enable even more frozen string in app/controllers +merge_request: +author: gfyoung +type: performance -- cgit v1.2.1