diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-01 20:22:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-01 20:22:04 +0000 |
| commit | 26debb120e6375175b1ffd83343b9974d8c6d060 (patch) | |
| tree | 35a18214d3d1e916ed6dc2b2266338526f2ca726 /scripts/lint-rugged | |
| parent | fd46d6ceb81eb9039b4e60c1d158848dd22ba411 (diff) | |
| parent | cf644fc1ff9890189ad2945fc38c7e6b9943cae3 (diff) | |
| download | gitlab-ce-zj-ref-contains.tar.gz | |
Merge branch 'master' into 'zj-ref-contains'zj-ref-contains
# Conflicts:
# lib/gitlab/git/repository.rb
Diffstat (limited to 'scripts/lint-rugged')
| -rwxr-xr-x | scripts/lint-rugged | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/lint-rugged b/scripts/lint-rugged index 03f780f880b..cabd083e9f9 100755 --- a/scripts/lint-rugged +++ b/scripts/lint-rugged @@ -1,7 +1,7 @@ #!/usr/bin/env ruby ALLOWED = [ - # Can be deleted (?) once rugged is no longer used in production. Doesn't make Rugged calls. + # Can be fixed once Rugged is no longer used in production. Doesn't make Rugged calls. 'config/initializers/8_metrics.rb', # Can be deleted once wiki's are fully (mandatory) migrated @@ -13,9 +13,6 @@ ALLOWED = [ # Needs to be migrated, https://gitlab.com/gitlab-org/gitaly/issues/954 'lib/tasks/gitlab/cleanup.rake', - # https://gitlab.com/gitlab-org/gitaly/issues/961 - 'app/models/repository.rb', - # The only place where Rugged code is still allowed in production 'lib/gitlab/git/' ].freeze |