Merge branch 'fix-teaspoon-task' into 'master'

Restrict teaspoon tasks introduced by !6059 to development environment.

Otherwise we get syntax errors in production environment, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6059#note_17597729

See merge request !7189

lib/tasks/teaspoon.rake

-Rake::Task['teaspoon'].clear if Rake::Task.task_defined?('teaspoon')
+unless Rails.env.production?
+  Rake::Task['teaspoon'].clear if Rake::Task.task_defined?('teaspoon')
 
-namespace :teaspoon do
+  namespace :teaspoon do
     desc 'GitLab | Teaspoon | Generate fixtures for JavaScript tests'
     RSpec::Core::RakeTask.new(:fixtures) do |t|
       ENV['NO_KNAPSACK'] = 'true'
@@ -14,10 +15,11 @@ namespace :teaspoon do
       options = {}
       abort('rake teaspoon:tests failed') if Teaspoon::Console.new(options).failures?
     end
-end
+  end
 
-desc 'GitLab | Teaspoon | Shortcut for teaspoon:fixtures and teaspoon:tests'
-task :teaspoon do
+  desc 'GitLab | Teaspoon | Shortcut for teaspoon:fixtures and teaspoon:tests'
+  task :teaspoon do
     Rake::Task['teaspoon:fixtures'].invoke
     Rake::Task['teaspoon:tests'].invoke
+  end
 end