Merge branch 'master' into feature/multi-level-container-registry-images

* master: (230 commits)
  Fix N+1 query in loading pipelines in merge requests
  Fix Spinach and Capybara dependencies
  Prevent users from disconnecting gitlab account from CAS
  30276 Move issue, mr, todos next to profile dropdown in top nav
  Refactor SearchController#show
  Properly eagerly-load the Capybara server for JS feature specs only
  Updating documentation to include a missing step in the update procedure
  Eager-load the Capybara server to prevent timeouts
  Increase Capybara's timeout
  Add metrics button to Environment Overview page
  Fix link to Jira service documentation
  Handle parsing OpenBSD ps output properly to display sidekiq infos on ...
  Eliminate unnecessary queries that add ~500 ms of load time for a large issue
  20914 Limits line length for project home page
  Allow users to import GitHub projects to subgroups
  Update dpl CI example
  Fix the docs:check:links job
  Don't clean up the gitlab-test-fork_bare repo
  Make GitLab use Gitaly for commit_is_ancestor
  Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery
  ...

3 files changed, 9 insertions, 3 deletions

diff --git a/spec/factories/boards.rb b/spec/factories/boards.rb
index a581725245a..4df9aef2846 100644
--- a/spec/factories/boards.rb
+++ b/spec/factories/boards.rb
@@ -3,7 +3,7 @@ FactoryGirl.define do
     project factory: :empty_project
 
     after(:create) do |board|
-      board.lists.create(list_type: :done)
+      board.lists.create(list_type: :closed)
     end
   end
 end
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index 2a2f3cca91c..f6a78811cbe 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -6,8 +6,8 @@ FactoryGirl.define do
     sequence(:position)
   end
 
-  factory :done_list, parent: :list do
-    list_type :done
+  factory :closed_list, parent: :list do
+    list_type :closed
     label nil
     position nil
   end
diff --git a/spec/factories/system_note_metadata.rb b/spec/factories/system_note_metadata.rb
new file mode 100644
index 00000000000..f487a2d7e4a
--- /dev/null
+++ b/spec/factories/system_note_metadata.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :system_note_metadata do
+    note
+    action 'merge'
+  end
+end