diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 03:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 03:08:49 +0000 |
| commit | a8c82a6395ed62380b9061a26d92e41d46c2877e (patch) | |
| tree | bd8ab49ac11104ad9ae953afd4c5e0036fdddaa2 /scripts | |
| parent | 0b881f91159cc97ccb7328a2e52977a60ea83fbe (diff) | |
| download | gitlab-ce-a8c82a6395ed62380b9061a26d92e41d46c2877e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/lint-rugged | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lint-rugged b/scripts/lint-rugged index 1b3fb54f70b..dfa4df8333f 100755 --- a/scripts/lint-rugged +++ b/scripts/lint-rugged @@ -15,6 +15,9 @@ ALLOWED = [ 'lib/gitlab/git/rugged_impl/', 'lib/gitlab/gitaly_client/storage_settings.rb', + # Needed to detect Rugged enabled: https://gitlab.com/gitlab-org/gitlab/issues/35371 + 'lib/gitlab/config_checker/puma_rugged_checker.rb', + # Needed for logging 'config/initializers/peek.rb', 'config/initializers/lograge.rb', @@ -27,7 +30,8 @@ ALLOWED = [ rugged_lines = IO.popen(%w[git grep -i -n rugged -- app config lib], &:read).lines rugged_lines = rugged_lines.select { |l| /^[^:]*\.rb:/ =~ l } rugged_lines = rugged_lines.reject { |l| l.start_with?(*ALLOWED) } -rugged_lines = rugged_lines.reject { |l| /(include|prepend) Gitlab::Git::RuggedImpl/ =~ l} +rugged_lines = rugged_lines.reject { |l| /(include|prepend) Gitlab::Git::RuggedImpl/ =~ l } +rugged_lines = rugged_lines.reject { |l| l.include?('Gitlab::ConfigChecker::PumaRuggedChecker.check') } rugged_lines = rugged_lines.reject do |line| code, _comment = line.split('# ', 2) code !~ /rugged/i |