diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-03-23 05:39:09 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-04-04 07:32:24 +0300 |
| commit | 93b08c8ce384b9a31830fddbe6164f8848e540b3 (patch) | |
| tree | 3afe49e8f171040559915073251777707f0c0d01 /lib | |
| parent | 36cfb0a7bd60285d1545be1fbc01452ab6c431e8 (diff) | |
Reset container width when switching to pipelines MR tab
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
Conflicts:
app/assets/javascripts/commit/pipelines/pipelines_table.js
app/assets/javascripts/merge_request_tabs.js
spec/javascripts/commit/pipelines/pipelines_spec.js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/karma.rake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake index 40465ea3bf0..62a12174efa 100644 --- a/lib/tasks/karma.rake +++ b/lib/tasks/karma.rake @@ -1,9 +1,10 @@ unless Rails.env.production? namespace :karma do desc 'GitLab | Karma | Generate fixtures for JavaScript tests' - RSpec::Core::RakeTask.new(:fixtures) do |t| + RSpec::Core::RakeTask.new(:fixtures, [:pattern]) do |t, args| + args.with_defaults(pattern: 'spec/javascripts/fixtures/*.rb') ENV['NO_KNAPSACK'] = 'true' - t.pattern = 'spec/javascripts/fixtures/*.rb' + t.pattern = args[:pattern] t.rspec_opts = '--format documentation' end |