diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-25 22:17:13 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-25 22:17:13 +0000 |
| commit | 5c166337860a3734fa4d73db53b16b09af5566c5 (patch) | |
| tree | 40131934edefd515ed0ad68d8b8925cf245122f6 | |
| parent | 3788b9c0e607199b930bdc0589a2ec9885adcf4f (diff) | |
| parent | 75cf72344f373dfdb36bb501c0c980519ed61576 (diff) | |
| download | gitlab-ce-5c166337860a3734fa4d73db53b16b09af5566c5.tar.gz | |
Merge branch '52993-ldap-rename_provider-rake-task-broken' into 'master'
Resolve "LDAP rename_provider rake task broken"
Closes #52993
See merge request gitlab-org/gitlab-ce!22582
| -rw-r--r-- | changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml | 5 | ||||
| -rw-r--r-- | lib/tasks/gitlab/ldap.rake | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml b/changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml new file mode 100644 index 00000000000..ca78f9a392e --- /dev/null +++ b/changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml @@ -0,0 +1,5 @@ +--- +title: Use gitlab_environment for ldap rake task +merge_request: 22582 +author: +type: fixed diff --git a/lib/tasks/gitlab/ldap.rake b/lib/tasks/gitlab/ldap.rake index c66a2a263dc..0459de27c96 100644 --- a/lib/tasks/gitlab/ldap.rake +++ b/lib/tasks/gitlab/ldap.rake @@ -1,7 +1,7 @@ namespace :gitlab do namespace :ldap do desc 'GitLab | LDAP | Rename provider' - task :rename_provider, [:old_provider, :new_provider] => :environment do |_, args| + task :rename_provider, [:old_provider, :new_provider] => :gitlab_environment do |_, args| old_provider = args[:old_provider] || prompt('What is the old provider? Ex. \'ldapmain\': '.color(:blue)) new_provider = args[:new_provider] || |