diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-11-20 16:43:24 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-11-20 16:43:24 +0300 |
| commit | 9fe85710f6bfae2363c01c827be434506ddca00a (patch) | |
| tree | d30b066658df669efab8bceb14f9986bdfc02f58 /app/controllers | |
| parent | 2ea250d4bff03b656403e85db14cc5a4be593c67 (diff) | |
| parent | f1bc7b6eb5cb9beab55e4edac87cc5e0b7ceb069 (diff) | |
Merge branch '49565-ssh-push-mirroring' into 'master'
SSH public-key authentication for push mirroring
Closes #49565
See merge request gitlab-org/gitlab-ce!22982
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/mirrors_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/mirrors_controller.rb b/app/controllers/projects/mirrors_controller.rb index 53176978416..ab7ab13657a 100644 --- a/app/controllers/projects/mirrors_controller.rb +++ b/app/controllers/projects/mirrors_controller.rb @@ -77,6 +77,10 @@ class Projects::MirrorsController < Projects::ApplicationController id enabled only_protected_branches + auth_method + password + ssh_known_hosts + regenerate_ssh_private_key ] ] end |