diff options
| author | Maxim Rydkin <maks.rydkin@gmail.com> | 2017-10-22 17:12:35 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-22 17:12:35 +0000 |
| commit | 1833328b309a1c8c9db45804439b50b6c8e3773a (patch) | |
| tree | 242efe6a1d55eec28377371928bbc4002e671b25 | |
| parent | d310a2d0bc2d51724276e46143f51b11fe03e961 (diff) | |
| download | gitlab-ce-1833328b309a1c8c9db45804439b50b6c8e3773a.tar.gz | |
Decrease ABC threshold to 54.28
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/28202_decrease_abc_threshold_step5.yml | 5 | ||||
| -rw-r--r-- | lib/backup/manager.rb | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index a900f2e39f9..c427f219a0d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -624,7 +624,7 @@ Style/PredicateName: # branches, and conditions. Metrics/AbcSize: Enabled: true - Max: 55.25 + Max: 54.28 # This cop checks if the length of a block exceeds some maximum value. Metrics/BlockLength: diff --git a/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml new file mode 100644 index 00000000000..1bff4d6930d --- /dev/null +++ b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml @@ -0,0 +1,5 @@ +--- +title: Decrease ABC threshold to 54.28 +merge_request: 14920 +author: Maxim Rydkin +type: other diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 092e82bd4d1..05aa79dc160 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -137,10 +137,12 @@ module Backup # restoring mismatching backups can lead to unexpected problems if settings[:gitlab_version] != Gitlab::VERSION - $progress.puts 'GitLab version mismatch:'.color(:red) - $progress.puts " Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".color(:red) - $progress.puts ' Please switch to the following version and try again:'.color(:red) - $progress.puts " version: #{settings[:gitlab_version]}".color(:red) + $progress.puts(<<~HEREDOC.color(:red)) + GitLab version mismatch: + Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup! + Please switch to the following version and try again: + version: #{settings[:gitlab_version]} + HEREDOC $progress.puts $progress.puts "Hint: git checkout v#{settings[:gitlab_version]}" exit 1 |