diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
| commit | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch) | |
| tree | 7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /spec/tasks | |
| parent | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tasks')
| -rw-r--r-- | spec/tasks/gitlab/import_export/import_rake_spec.rb | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/storage_rake_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/tasks/gitlab/import_export/import_rake_spec.rb b/spec/tasks/gitlab/import_export/import_rake_spec.rb index b824ede03b2..14e53273a5b 100644 --- a/spec/tasks/gitlab/import_export/import_rake_spec.rb +++ b/spec/tasks/gitlab/import_export/import_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:import_export:import rake task', :sidekiq do +describe 'gitlab:import_export:import rake task' do let(:username) { 'root' } let(:namespace_path) { username } let!(:user) { create(:user, username: username) } diff --git a/spec/tasks/gitlab/storage_rake_spec.rb b/spec/tasks/gitlab/storage_rake_spec.rb index ae11e091000..54a84c73a57 100644 --- a/spec/tasks/gitlab/storage_rake_spec.rb +++ b/spec/tasks/gitlab/storage_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'rake gitlab:storage:*', :sidekiq do +describe 'rake gitlab:storage:*' do before do Rake.application.rake_require 'tasks/gitlab/storage' |