Merge branch '44425-use-gitlab_environment' into 'master'

Resolve "Disabling two factor authentication via gitlab-rake fails" Closes #44425 See merge request gitlab-org/gitlab-ce!18154

Merge branch '44425-use-gitlab_environment' into 'master'
67ca10f3 · Douwe Maan · 4131c39a · b3723fe2 · 67ca10f3 · 67ca10f3
Commit 67ca10f3 authored Apr 03, 2018 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

44425-use-gitlab_environment.yml changelogs/unreleased/44425-use-gitlab_environment.yml +5 -0

two_factor.rake lib/tasks/gitlab/two_factor.rake +1 -1

No files found.
--- a/changelogs/unreleased/44425-use-gitlab_environment.yml
+++ b/changelogs/unreleased/44425-use-gitlab_environment.yml
+---
+title: Fix `gitlab-rake gitlab:two_factor:disable_for_all_users`
+merge_request: 18154
+author:
+type: fixed
--- a/lib/tasks/gitlab/two_factor.rake
+++ b/lib/tasks/gitlab/two_factor.rake
 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