3 files changed, 2 insertions, 61 deletions
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index 523b0fa055b..2222807fe13 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -4,7 +4,6 @@ namespace :gitlab do
     cmds = [
       %w(rake brakeman),
       %w(rake rubocop),
-      %w(rake spinach),
       %w(rake spec),
       %w(rake karma)
     ]
diff --git a/lib/tasks/migrate/setup_postgresql.rake b/lib/tasks/migrate/setup_postgresql.rake
index af30ecb0e9b..e7aab50e42a 100644
--- a/lib/tasks/migrate/setup_postgresql.rake
+++ b/lib/tasks/migrate/setup_postgresql.rake
@@ -8,6 +8,7 @@ task setup_postgresql: :environment do
   require Rails.root.join('db/migrate/20170503185032_index_redirect_routes_path_for_like')
   require Rails.root.join('db/migrate/20171220191323_add_index_on_namespaces_lower_name.rb')
   require Rails.root.join('db/migrate/20180215181245_users_name_lower_index.rb')
+  require Rails.root.join('db/migrate/20180504195842_project_name_lower_index.rb')
   require Rails.root.join('db/post_migrate/20180306164012_add_path_index_to_redirect_routes.rb')
 
   NamespacesProjectsPathLowerIndexes.new.up
@@ -18,5 +19,6 @@ task setup_postgresql: :environment do
   IndexRedirectRoutesPathForLike.new.up
   AddIndexOnNamespacesLowerName.new.up
   UsersNameLowerIndex.new.up
+  ProjectNameLowerIndex.new.up
   AddPathIndexToRedirectRoutes.new.up
 end
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
deleted file mode 100644
index 19ff13f06c0..00000000000
--- a/lib/tasks/spinach.rake
+++ /dev/null
@@ -1,60 +0,0 @@
-Rake::Task["spinach"].clear if Rake::Task.task_defined?('spinach')
-
-namespace :spinach do
-  namespace :project do
-    desc "GitLab | Spinach | Run project commits, issues and merge requests spinach features"
-    task :half do
-      run_spinach_tests('@project_commits,@project_issues,@project_merge_requests')
-    end
-
-    desc "GitLab | Spinach | Run remaining project spinach features"
-    task :rest do
-      run_spinach_tests('~@admin,~@dashboard,~@profile,~@public,~@snippets,~@project_commits,~@project_issues,~@project_merge_requests')
-    end
-  end
-
-  desc "GitLab | Spinach | Run project spinach features"
-  task :project do
-    run_spinach_tests('~@admin,~@dashboard,~@profile,~@public,~@snippets')
-  end
-
-  desc "GitLab | Spinach | Run other spinach features"
-  task :other do
-    run_spinach_tests('@admin,@dashboard,@profile,@public,@snippets')
-  end
-
-  desc "GitLab | Spinach | Run other spinach features"
-  task :builds do
-    run_spinach_tests('@builds')
-  end
-end
-
-desc "GitLab | Run spinach"
-task :spinach do
-  run_spinach_tests(nil)
-end
-
-def run_system_command(cmd)
-  system({ 'RAILS_ENV' => 'test', 'force' => 'yes' }, *cmd)
-end
-
-def run_spinach_command(args)
-  run_system_command(%w(spinach -r rerun) + args)
-end
-
-def run_spinach_tests(tags)
-  success = run_spinach_command(%W(--tags #{tags}))
-  3.times do |_|
-    break if success
-    break unless File.exist?('tmp/spinach-rerun.txt')
-
-    tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp)
-    puts ''
-    puts "Spinach tests for #{tags}: Retrying tests... #{tests}".color(:red)
-    puts ''
-    sleep(3)
-    success = run_spinach_command(tests)
-  end
-
-  raise("spinach tests for #{tags} failed!") unless success
-end