From 4f24a65e45840371b290930b70a8e98d42cea9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= <mbergeron@gitlab.com>
Date: Thu, 29 Mar 2018 10:45:36 -0400
Subject: fix the rake task from being to strict about Group

---
 lib/tasks/gitlab/uploads/migrate.rake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/tasks')

diff --git a/lib/tasks/gitlab/uploads/migrate.rake b/lib/tasks/gitlab/uploads/migrate.rake
index e7e656a911b..78e18992a8e 100644
--- a/lib/tasks/gitlab/uploads/migrate.rake
+++ b/lib/tasks/gitlab/uploads/migrate.rake
@@ -13,6 +13,7 @@ namespace :gitlab do
 
     def enqueue_batch(batch, index)
       job = ObjectStorage::MigrateUploadsWorker.enqueue!(batch,
+                                                         @model_class,
                                                          @mounted_as,
                                                          @to_store)
       puts "Enqueued job ##{index}: #{job}"
-- 
cgit v1.2.1


From 95d52c9faf23b519823bec4e5b32df54a59b22c1 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Tue, 3 Apr 2018 07:45:27 +0900
Subject: Remove test_ci rake task

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
---
 lib/tasks/test.rake | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lib/tasks')

diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index 3e01f91d32c..b52af81fc16 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -4,8 +4,3 @@ desc "GitLab | Run all tests"
 task :test do
   Rake::Task["gitlab:test"].invoke
 end
-
-unless Rails.env.production?
-  desc "GitLab | Run all tests on CI with simplecov"
-  task test_ci: [:rubocop, :brakeman, :karma, :spinach, :spec]
-end
-- 
cgit v1.2.1


From b3723fe28ef5dde912994b2f180622aa87e96d12 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 3 Apr 2018 22:55:32 +0800
Subject: Use gitlab_environment because we need:

* ask_to_continue
* Gitlab::TaskAbortedByUserError
---
 lib/tasks/gitlab/two_factor.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tasks')

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
 
-- 
cgit v1.2.1