Commit cf014206 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'sh-upgrade-rubocop-0.68.0' into 'master'

[EE] Upgrade Rubocop to 0.68.1

See merge request gitlab-org/gitlab-ee!11982
parents 7ac2c165 8b9ef762
...@@ -935,7 +935,7 @@ GEM ...@@ -935,7 +935,7 @@ GEM
sys-filesystem (1.1.6) sys-filesystem (1.1.6)
ffi ffi
sysexits (1.2.0) sysexits (1.2.0)
temple (0.8.0) temple (0.8.1)
test-prof (0.2.5) test-prof (0.2.5)
text (1.3.1) text (1.3.1)
thin (1.7.2) thin (1.7.2)
...@@ -945,7 +945,7 @@ GEM ...@@ -945,7 +945,7 @@ GEM
thor (0.19.4) thor (0.19.4)
thread_safe (0.3.6) thread_safe (0.3.6)
thrift (0.11.0.0) thrift (0.11.0.0)
tilt (2.0.8) tilt (2.0.9)
timecop (0.8.1) timecop (0.8.1)
timfel-krb5-auth (0.8.3) timfel-krb5-auth (0.8.3)
toml (0.2.0) toml (0.2.0)
...@@ -1121,7 +1121,7 @@ DEPENDENCIES ...@@ -1121,7 +1121,7 @@ DEPENDENCIES
graphql (~> 1.8.0) graphql (~> 1.8.0)
grpc (~> 1.19.0) grpc (~> 1.19.0)
gssapi gssapi
haml_lint (~> 0.28.0) haml_lint (~> 0.30.0)
hamlit (~> 2.8.8) hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5) hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes hashie-forbidden_attributes
......
...@@ -6,7 +6,7 @@ module EE ...@@ -6,7 +6,7 @@ module EE
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
prepended do prepended do
WEIGHT_RANGE = 0..20 WEIGHT_RANGE = (0..20).freeze
WEIGHT_ALL = 'Everything'.freeze WEIGHT_ALL = 'Everything'.freeze
WEIGHT_ANY = 'Any'.freeze WEIGHT_ANY = 'Any'.freeze
WEIGHT_NONE = 'None'.freeze WEIGHT_NONE = 'None'.freeze
......
...@@ -9,7 +9,7 @@ module API ...@@ -9,7 +9,7 @@ module API
module V3 module V3
class Github < Grape::API class Github < Grape::API
JIRA_DEV_PANEL_FEATURE = :jira_dev_panel_integration.freeze JIRA_DEV_PANEL_FEATURE = :jira_dev_panel_integration.freeze
NO_SLASH_URL_PART_REGEX = %r{[^/]+} NO_SLASH_URL_PART_REGEX = %r{[^/]+}.freeze
NAMESPACE_ENDPOINT_REQUIREMENTS = { namespace: NO_SLASH_URL_PART_REGEX }.freeze NAMESPACE_ENDPOINT_REQUIREMENTS = { namespace: NO_SLASH_URL_PART_REGEX }.freeze
PROJECT_ENDPOINT_REQUIREMENTS = NAMESPACE_ENDPOINT_REQUIREMENTS.merge(project: NO_SLASH_URL_PART_REGEX).freeze PROJECT_ENDPOINT_REQUIREMENTS = NAMESPACE_ENDPOINT_REQUIREMENTS.merge(project: NO_SLASH_URL_PART_REGEX).freeze
......
# rubocop:disable Naming/FileName
# frozen_string_literal: true # frozen_string_literal: true
require 'ipaddr' require 'ipaddr'
......
...@@ -5,7 +5,7 @@ module Gitlab ...@@ -5,7 +5,7 @@ module Gitlab
module Dvcs module Dvcs
ENCODED_SLASH = '@'.freeze ENCODED_SLASH = '@'.freeze
SLASH = '/'.freeze SLASH = '/'.freeze
ENCODED_ROUTE_REGEX = /[a-zA-Z0-9_\-\.#{ENCODED_SLASH}]+/ ENCODED_ROUTE_REGEX = /[a-zA-Z0-9_\-\.#{ENCODED_SLASH}]+/.freeze
def self.encode_slash(path) def self.encode_slash(path)
path.gsub(SLASH, ENCODED_SLASH) path.gsub(SLASH, ENCODED_SLASH)
......
...@@ -14,7 +14,7 @@ module SystemCheck ...@@ -14,7 +14,7 @@ module SystemCheck
\k<quote> # boundary for command, backtracks the same detected quote, or none \k<quote> # boundary for command, backtracks the same detected quote, or none
\s* # optional any amount of space character \s* # optional any amount of space character
(?:\#.*)?$ # optional start-comment symbol followed by optionally any character until end of line (?:\#.*)?$ # optional start-comment symbol followed by optionally any character until end of line
}x }x.freeze
OPENSSH_AUTHORIZED_KEYS_USER_REGEXP = %r{ OPENSSH_AUTHORIZED_KEYS_USER_REGEXP = %r{
^AuthorizedKeysCommandUser # line starts with ^AuthorizedKeysCommandUser # line starts with
\s+ # one space or more \s+ # one space or more
...@@ -23,7 +23,7 @@ module SystemCheck ...@@ -23,7 +23,7 @@ module SystemCheck
\k<quote> # boundary for command, backtracks the same detected quote, or none \k<quote> # boundary for command, backtracks the same detected quote, or none
\s* # optional any amount of space character \s* # optional any amount of space character
(?:\#.*)?$ # optional start-comment symbol followed by optionally any character until end of line (?:\#.*)?$ # optional start-comment symbol followed by optionally any character until end of line
}x }x.freeze
OPENSSH_EXPECTED_COMMAND = '/opt/gitlab/embedded/service/gitlab-shell/bin/gitlab-shell-authorized-keys-check git %u %k'.freeze OPENSSH_EXPECTED_COMMAND = '/opt/gitlab/embedded/service/gitlab-shell/bin/gitlab-shell-authorized-keys-check git %u %k'.freeze
def multi_check def multi_check
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment