summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-04-03 22:55:32 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-04-03 23:00:09 +0800
commitb3723fe28ef5dde912994b2f180622aa87e96d12 (patch)
tree24e4d57309259e18d1a2e699b6ad903565f4c67d
parent77a6afd569243e479499231c16c5e72e24707f0d (diff)
downloadgitlab-ce-b3723fe28ef5dde912994b2f180622aa87e96d12.tar.gz
Use gitlab_environment because we need:
* ask_to_continue * Gitlab::TaskAbortedByUserError
-rw-r--r--changelogs/unreleased/44425-use-gitlab_environment.yml5
-rw-r--r--lib/tasks/gitlab/two_factor.rake2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/44425-use-gitlab_environment.yml b/changelogs/unreleased/44425-use-gitlab_environment.yml
new file mode 100644
index 00000000000..a774143d5f5
--- /dev/null
+++ b/changelogs/unreleased/44425-use-gitlab_environment.yml
@@ -0,0 +1,5 @@
+---
+title: Fix `gitlab-rake gitlab:two_factor:disable_for_all_users`
+merge_request: 18154
+author:
+type: fixed
diff --git a/lib/tasks/gitlab/two_factor.rake b/lib/tasks/gitlab/two_factor.rake
index 7728c485e8d..6b22499a5c8 100644
--- a/lib/tasks/gitlab/two_factor.rake
+++ b/lib/tasks/gitlab/two_factor.rake
@@ -1,7 +1,7 @@
namespace :gitlab do
namespace :two_factor do
desc "GitLab | Disable Two-factor authentication (2FA) for all users"
- task disable_for_all_users: :environment do
+ task disable_for_all_users: :gitlab_environment do
scope = User.with_two_factor
count = scope.count