Merge branch 'resolve-some-rake-differences' into 'master'

Resolve some Rake task differences

See merge request gitlab-org/gitlab-ce!25644

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

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'