diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 14:39:00 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 14:39:00 +0100 |
| commit | 05afd11e16aecd43adfb869ae90aa6cae13916ec (patch) | |
| tree | 63b31431981d48ac970853778dd01a5301bb9564 /app/controllers/projects/settings/repository_controller.rb | |
| parent | 086549d986a453e1b2dd0d09ffbd19d0487d9c51 (diff) | |
| parent | 28086b203ae397e01d5e9870dfbddd66466450c2 (diff) | |
| download | gitlab-ce-05afd11e16aecd43adfb869ae90aa6cae13916ec.tar.gz | |
Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
Diffstat (limited to 'app/controllers/projects/settings/repository_controller.rb')
| -rw-r--r-- | app/controllers/projects/settings/repository_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb index 4697af4f26a..ccd481b4dbd 100644 --- a/app/controllers/projects/settings/repository_controller.rb +++ b/app/controllers/projects/settings/repository_controller.rb @@ -31,6 +31,7 @@ module Projects render 'show' end + # rubocop: disable CodeReuse/ActiveRecord def define_protected_refs @protected_branches = @project.protected_branches.order(:name).page(params[:page]) @protected_tags = @project.protected_tags.order(:name).page(params[:page]) @@ -42,6 +43,7 @@ module Projects load_gon_index end + # rubocop: enable CodeReuse/ActiveRecord def remote_mirror @remote_mirror = project.remote_mirrors.first_or_initialize |