diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 15:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 15:07:51 +0000 |
| commit | 4e9acbfba3682c552b3de707c535e6257ef41054 (patch) | |
| tree | 8b1fd5f89ad3f1be68d8944815b13bb7d498e4a6 /app/controllers | |
| parent | 506d6dcd7c787ba71a8a53102f3d4fdb6adcfa5e (diff) | |
| download | gitlab-ce-4e9acbfba3682c552b3de707c535e6257ef41054.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/mirrors_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/mirrors_controller.rb b/app/controllers/projects/mirrors_controller.rb index 936f89e58e7..518e6a92afa 100644 --- a/app/controllers/projects/mirrors_controller.rb +++ b/app/controllers/projects/mirrors_controller.rb @@ -77,6 +77,7 @@ class Projects::MirrorsController < Projects::ApplicationController id enabled only_protected_branches + keep_divergent_refs auth_method password ssh_known_hosts |