From 736b5908da637cbb35eb5fd1a10790c2ee17fcde Mon Sep 17 00:00:00 2001 From: Dinesh Panda Date: Tue, 10 Sep 2019 08:11:43 +0000 Subject: Avoid calling freeze on already frozen strings in lib --- lib/api/helpers.rb | 6 +++--- lib/api/helpers/runner.rb | 2 +- lib/backup/manager.rb | 2 +- lib/banzai/filter/color_filter.rb | 2 +- lib/banzai/filter/external_link_filter.rb | 4 ++-- lib/banzai/filter/footnote_filter.rb | 4 ++-- lib/banzai/filter/math_filter.rb | 8 ++++---- lib/banzai/filter/suggestion_filter.rb | 2 +- lib/banzai/filter/syntax_highlight_filter.rb | 4 ++-- lib/banzai/issuable_extractor.rb | 4 ++-- lib/bitbucket/connection.rb | 4 ++-- lib/gitlab.rb | 4 ++-- lib/google_api/cloud_platform/client.rb | 4 ++-- lib/quality/test_level.rb | 2 +- lib/system_check/app/init_script_up_to_date_check.rb | 2 +- lib/system_check/app/redis_version_check.rb | 2 +- lib/tasks/gitlab/graphql.rake | 4 ++-- lib/tasks/gitlab/uploads/legacy.rake | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 5755f4b8d74..e61b25721fb 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -5,10 +5,10 @@ module API include Gitlab::Utils include Helpers::Pagination - SUDO_HEADER = "HTTP_SUDO".freeze - GITLAB_SHARED_SECRET_HEADER = "Gitlab-Shared-Secret".freeze + SUDO_HEADER = "HTTP_SUDO" + GITLAB_SHARED_SECRET_HEADER = "Gitlab-Shared-Secret" SUDO_PARAM = :sudo - API_USER_ENV = 'gitlab.api.user'.freeze + API_USER_ENV = 'gitlab.api.user' def declared_params(options = {}) options = { include_parent_namespaces: false }.merge(options) diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 5b87eccf860..41ee34a8fdf 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -3,7 +3,7 @@ module API module Helpers module Runner - JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze + JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN' JOB_TOKEN_PARAM = :token def runner_registration_token_valid? diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index aeaf61cda39..c0390959269 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -4,7 +4,7 @@ module Backup class Manager ARCHIVES_TO_BACKUP = %w[uploads builds artifacts pages lfs registry].freeze FOLDERS_TO_BACKUP = %w[repositories db].freeze - FILE_NAME_SUFFIX = '_gitlab_backup.tar'.freeze + FILE_NAME_SUFFIX = '_gitlab_backup.tar' attr_reader :progress diff --git a/lib/banzai/filter/color_filter.rb b/lib/banzai/filter/color_filter.rb index 6d9bdb9cbd3..0aca7441638 100644 --- a/lib/banzai/filter/color_filter.rb +++ b/lib/banzai/filter/color_filter.rb @@ -5,7 +5,7 @@ module Banzai # HTML filter that renders `color` followed by a color "chip". # class ColorFilter < HTML::Pipeline::Filter - COLOR_CHIP_CLASS = 'gfm-color_chip'.freeze + COLOR_CHIP_CLASS = 'gfm-color_chip' def call doc.css('code').each do |node| diff --git a/lib/banzai/filter/external_link_filter.rb b/lib/banzai/filter/external_link_filter.rb index fb721fe12b1..67019454e44 100644 --- a/lib/banzai/filter/external_link_filter.rb +++ b/lib/banzai/filter/external_link_filter.rb @@ -5,8 +5,8 @@ module Banzai # HTML Filter to modify the attributes of external links class ExternalLinkFilter < HTML::Pipeline::Filter SCHEMES = ['http', 'https', nil].freeze - RTLO = "\u202E".freeze - ENCODED_RTLO = '%E2%80%AE'.freeze + RTLO = "\u202E" + ENCODED_RTLO = '%E2%80%AE' def call links.each do |node| diff --git a/lib/banzai/filter/footnote_filter.rb b/lib/banzai/filter/footnote_filter.rb index de133774dfa..5474242e03c 100644 --- a/lib/banzai/filter/footnote_filter.rb +++ b/lib/banzai/filter/footnote_filter.rb @@ -17,8 +17,8 @@ module Banzai # class FootnoteFilter < HTML::Pipeline::Filter INTEGER_PATTERN = /\A\d+\z/.freeze - FOOTNOTE_ID_PREFIX = 'fn'.freeze - FOOTNOTE_LINK_ID_PREFIX = 'fnref'.freeze + FOOTNOTE_ID_PREFIX = 'fn' + FOOTNOTE_LINK_ID_PREFIX = 'fnref' FOOTNOTE_LI_REFERENCE_PATTERN = /\A#{FOOTNOTE_ID_PREFIX}\d+\z/.freeze FOOTNOTE_LINK_REFERENCE_PATTERN = /\A#{FOOTNOTE_LINK_ID_PREFIX}\d+\z/.freeze FOOTNOTE_START_NUMBER = 1 diff --git a/lib/banzai/filter/math_filter.rb b/lib/banzai/filter/math_filter.rb index 8dd5a8979c8..c915f0ee35b 100644 --- a/lib/banzai/filter/math_filter.rb +++ b/lib/banzai/filter/math_filter.rb @@ -11,14 +11,14 @@ module Banzai # class MathFilter < HTML::Pipeline::Filter # Attribute indicating inline or display math. - STYLE_ATTRIBUTE = 'data-math-style'.freeze + STYLE_ATTRIBUTE = 'data-math-style' # Class used for tagging elements that should be rendered - TAG_CLASS = 'js-render-math'.freeze + TAG_CLASS = 'js-render-math' - INLINE_CLASSES = "code math #{TAG_CLASS}".freeze + INLINE_CLASSES = "code math #{TAG_CLASS}" - DOLLAR_SIGN = '$'.freeze + DOLLAR_SIGN = '$' def call doc.css('code').each do |code| diff --git a/lib/banzai/filter/suggestion_filter.rb b/lib/banzai/filter/suggestion_filter.rb index 3d40abfc540..ae093580001 100644 --- a/lib/banzai/filter/suggestion_filter.rb +++ b/lib/banzai/filter/suggestion_filter.rb @@ -5,7 +5,7 @@ module Banzai module Filter class SuggestionFilter < HTML::Pipeline::Filter # Class used for tagging elements that should be rendered - TAG_CLASS = 'js-render-suggestion'.freeze + TAG_CLASS = 'js-render-suggestion' def call return doc unless suggestions_filter_enabled? diff --git a/lib/banzai/filter/syntax_highlight_filter.rb b/lib/banzai/filter/syntax_highlight_filter.rb index 9b66759a5fb..c1a5f33c225 100644 --- a/lib/banzai/filter/syntax_highlight_filter.rb +++ b/lib/banzai/filter/syntax_highlight_filter.rb @@ -10,8 +10,8 @@ module Banzai class SyntaxHighlightFilter < HTML::Pipeline::Filter include OutputSafety - PARAMS_DELIMITER = ':'.freeze - LANG_PARAMS_ATTR = 'data-lang-params'.freeze + PARAMS_DELIMITER = ':' + LANG_PARAMS_ATTR = 'data-lang-params' def call doc.search('pre:not([data-math-style]) > code').each do |node| diff --git a/lib/banzai/issuable_extractor.rb b/lib/banzai/issuable_extractor.rb index 341dbb74fe0..31bb4f2e01c 100644 --- a/lib/banzai/issuable_extractor.rb +++ b/lib/banzai/issuable_extractor.rb @@ -11,8 +11,8 @@ module Banzai class IssuableExtractor attr_reader :context - ISSUE_REFERENCE_TYPE = '@data-reference-type="issue"'.freeze - MERGE_REQUEST_REFERENCE_TYPE = '@data-reference-type="merge_request"'.freeze + ISSUE_REFERENCE_TYPE = '@data-reference-type="issue"' + MERGE_REQUEST_REFERENCE_TYPE = '@data-reference-type="merge_request"' # context - An instance of Banzai::RenderContext. def initialize(context) diff --git a/lib/bitbucket/connection.rb b/lib/bitbucket/connection.rb index 0041634f9e3..9937236fc44 100644 --- a/lib/bitbucket/connection.rb +++ b/lib/bitbucket/connection.rb @@ -2,8 +2,8 @@ module Bitbucket class Connection - DEFAULT_API_VERSION = '2.0'.freeze - DEFAULT_BASE_URI = 'https://api.bitbucket.org/'.freeze + DEFAULT_API_VERSION = '2.0' + DEFAULT_BASE_URI = 'https://api.bitbucket.org/' DEFAULT_QUERY = {}.freeze attr_reader :expires_at, :expires_in, :refresh_token, :token diff --git a/lib/gitlab.rb b/lib/gitlab.rb index e8b938e46b1..582541c0679 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -29,13 +29,13 @@ module Gitlab if result.status.success? result.stdout.chomp.freeze else - "Unknown".freeze + "Unknown" end end end end - COM_URL = 'https://gitlab.com'.freeze + COM_URL = 'https://gitlab.com' APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}.freeze SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}.freeze VERSION = File.read(root.join("VERSION")).strip.freeze diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index b5f99ea012b..9f01a3f97ce 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -8,9 +8,9 @@ require 'google/apis/cloudresourcemanager_v1' module GoogleApi module CloudPlatform class Client < GoogleApi::Auth - SCOPE = 'https://www.googleapis.com/auth/cloud-platform'.freeze + SCOPE = 'https://www.googleapis.com/auth/cloud-platform' LEAST_TOKEN_LIFE_TIME = 10.minutes - CLUSTER_MASTER_AUTH_USERNAME = 'admin'.freeze + CLUSTER_MASTER_AUTH_USERNAME = 'admin' class << self def session_key_for_token diff --git a/lib/quality/test_level.rb b/lib/quality/test_level.rb index 60d79b52680..a65657dadd0 100644 --- a/lib/quality/test_level.rb +++ b/lib/quality/test_level.rb @@ -53,7 +53,7 @@ module Quality end def pattern(level) - @patterns[level] ||= "#{prefix}spec/{#{TEST_LEVEL_FOLDERS.fetch(level).join(',')}}{,/**/}*_spec.rb".freeze + @patterns[level] ||= "#{prefix}spec/{#{TEST_LEVEL_FOLDERS.fetch(level).join(',')}}{,/**/}*_spec.rb" end def regexp(level) diff --git a/lib/system_check/app/init_script_up_to_date_check.rb b/lib/system_check/app/init_script_up_to_date_check.rb index 569c41df6e4..7e2e168af8b 100644 --- a/lib/system_check/app/init_script_up_to_date_check.rb +++ b/lib/system_check/app/init_script_up_to_date_check.rb @@ -3,7 +3,7 @@ module SystemCheck module App class InitScriptUpToDateCheck < SystemCheck::BaseCheck - SCRIPT_PATH = '/etc/init.d/gitlab'.freeze + SCRIPT_PATH = '/etc/init.d/gitlab' set_name 'Init script up-to-date?' set_skip_reason 'skipped (omnibus-gitlab has no init script)' diff --git a/lib/system_check/app/redis_version_check.rb b/lib/system_check/app/redis_version_check.rb index 890f8b44d13..da695cc9272 100644 --- a/lib/system_check/app/redis_version_check.rb +++ b/lib/system_check/app/redis_version_check.rb @@ -3,7 +3,7 @@ module SystemCheck module App class RedisVersionCheck < SystemCheck::BaseCheck - MIN_REDIS_VERSION = '2.8.0'.freeze + MIN_REDIS_VERSION = '2.8.0' set_name "Redis version >= #{MIN_REDIS_VERSION}?" def check? diff --git a/lib/tasks/gitlab/graphql.rake b/lib/tasks/gitlab/graphql.rake index c53d55ceea2..fd8df015903 100644 --- a/lib/tasks/gitlab/graphql.rake +++ b/lib/tasks/gitlab/graphql.rake @@ -3,8 +3,8 @@ return if Rails.env.production? namespace :gitlab do - OUTPUT_DIR = Rails.root.join("doc/api/graphql/reference").freeze - TEMPLATES_DIR = 'lib/gitlab/graphql/docs/templates/'.freeze + OUTPUT_DIR = Rails.root.join("doc/api/graphql/reference") + TEMPLATES_DIR = 'lib/gitlab/graphql/docs/templates/' namespace :graphql do desc 'GitLab | Generate GraphQL docs' diff --git a/lib/tasks/gitlab/uploads/legacy.rake b/lib/tasks/gitlab/uploads/legacy.rake index 18fb8afe455..2eeb694d341 100644 --- a/lib/tasks/gitlab/uploads/legacy.rake +++ b/lib/tasks/gitlab/uploads/legacy.rake @@ -11,7 +11,7 @@ namespace :gitlab do include ::EachBatch end - migration = 'LegacyUploadsMigrator'.freeze + migration = 'LegacyUploadsMigrator' batch_size = 5000 delay_interval = 5.minutes.to_i -- cgit v1.2.1