diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-04 14:45:21 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-04 14:45:21 +0300 |
| commit | c1c30f19a1ab9cd8099a97e69bdbee0db1d5bc3b (patch) | |
| tree | 5d93b056acf090473b4b4720779ea0ac8d103346 | |
| parent | 751c8c8e47eb3acb225d633eb9dcdaf4151822f7 (diff) | |
| parent | bb873b1e3b169080a34fc53b24fe2c18acbf83ab (diff) | |
Merge branch 'resolve-some-rake-differences' into 'master'
Resolve some Rake task differences
See merge request gitlab-org/gitlab-ce!25644
| -rw-r--r-- | lib/tasks/gitlab/backup.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/karma.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index 3a1a36e36ce..3977fc7ad8c 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -61,7 +61,7 @@ namespace :gitlab do Rake::Task['gitlab:backup:uploads:restore'].invoke unless backup.skipped?('uploads') Rake::Task['gitlab:backup:builds:restore'].invoke unless backup.skipped?('builds') Rake::Task['gitlab:backup:artifacts:restore'].invoke unless backup.skipped?('artifacts') - Rake::Task["gitlab:backup:pages:restore"].invoke unless backup.skipped?('pages') + Rake::Task['gitlab:backup:pages:restore'].invoke unless backup.skipped?('pages') Rake::Task['gitlab:backup:lfs:restore'].invoke unless backup.skipped?('lfs') Rake::Task['gitlab:backup:registry:restore'].invoke unless backup.skipped?('registry') Rake::Task['gitlab:shell:setup'].invoke diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake index 62a12174efa..53325d492d1 100644 --- a/lib/tasks/karma.rake +++ b/lib/tasks/karma.rake @@ -2,7 +2,7 @@ unless Rails.env.production? namespace :karma do desc 'GitLab | Karma | Generate fixtures for JavaScript tests' RSpec::Core::RakeTask.new(:fixtures, [:pattern]) do |t, args| - args.with_defaults(pattern: 'spec/javascripts/fixtures/*.rb') + args.with_defaults(pattern: '{spec,ee/spec}/javascripts/fixtures/*.rb') ENV['NO_KNAPSACK'] = 'true' t.pattern = args[:pattern] t.rspec_opts = '--format documentation' |