Merge branch 'master' into go-go-gadget-webpack

* master: (181 commits)
  Fixed adding to list bug
  Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
  Fixed modal lists dropdown not updating when list is deleted
  Fixed remove btn error after creating new issue in list
  Removed duplicated test
  Removed Masonry, instead uses groups of data
  Uses mixins for repeated functions
  Fixed up specs
  Props use objects with required & type values
  Removes labels instead of closing issue when clicking remove button
  Fixed JS lint errors
  Fixed issue card spec
  Added webkit CSS properties
  Fixed bug with empty state showing after search Fixed users href path being incorrect
  Fixed bug where 2 un-selected issues would stay on selected tab
  Fixed DB schema Changed how components are added in objects
  Added remove button
  Add optional id property to the issue schema
  Fixed issue link href
  Disabled add issues button if no lists exist
  ...

74 files changed, 1377 insertions, 628 deletions

diff --git a/spec/controllers/projects/boards/issues_controller_spec.rb b/spec/controllers/projects/boards/issues_controller_spec.rb
index 299d2c981d3..ad15e3942a5 100644
--- a/spec/controllers/projects/boards/issues_controller_spec.rb
+++ b/spec/controllers/projects/boards/issues_controller_spec.rb
@@ -18,23 +18,7 @@ describe Projects::Boards::IssuesController do
   end
 
   describe 'GET index' do
-    context 'with valid list id' do
-      it 'returns issues that have the list label applied' do
-        johndoe = create(:user, avatar: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png')))
-        issue = create(:labeled_issue, project: project, labels: [planning])
-        create(:labeled_issue, project: project, labels: [planning])
-        create(:labeled_issue, project: project, labels: [development], due_date: Date.tomorrow)
-        create(:labeled_issue, project: project, labels: [development], assignee: johndoe)
-        issue.subscribe(johndoe, project)
-
-        list_issues user: user, board: board, list: list2
-
-        parsed_response = JSON.parse(response.body)
-
-        expect(response).to match_response_schema('issues')
-        expect(parsed_response.length).to eq 2
-      end
-    end
+    let(:johndoe) { create(:user, avatar: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png'))) }
 
     context 'with invalid board id' do
       it 'returns a not found 404 response' do
@@ -44,11 +28,47 @@ describe Projects::Boards::IssuesController do
       end
     end
 
-    context 'with invalid list id' do
-      it 'returns a not found 404 response' do
-        list_issues user: user, board: board, list: 999
+    context 'when list id is present' do
+      context 'with valid list id' do
+        it 'returns issues that have the list label applied' do
+          issue = create(:labeled_issue, project: project, labels: [planning])
+          create(:labeled_issue, project: project, labels: [planning])
+          create(:labeled_issue, project: project, labels: [development], due_date: Date.tomorrow)
+          create(:labeled_issue, project: project, labels: [development], assignee: johndoe)
+          issue.subscribe(johndoe, project)
 
-        expect(response).to have_http_status(404)
+          list_issues user: user, board: board, list: list2
+
+          parsed_response = JSON.parse(response.body)
+
+          expect(response).to match_response_schema('issues')
+          expect(parsed_response.length).to eq 2
+        end
+      end
+
+      context 'with invalid list id' do
+        it 'returns a not found 404 response' do
+          list_issues user: user, board: board, list: 999
+
+          expect(response).to have_http_status(404)
+        end
+      end
+    end
+
+    context 'when list id is missing' do
+      it 'returns opened issues without board labels applied' do
+        bug = create(:label, project: project, name: 'Bug')
+        create(:issue, project: project)
+        create(:labeled_issue, project: project, labels: [planning])
+        create(:labeled_issue, project: project, labels: [development])
+        create(:labeled_issue, project: project, labels: [bug])
+
+        list_issues user: user, board: board
+
+        parsed_response = JSON.parse(response.body)
+
+        expect(response).to match_response_schema('issues')
+        expect(parsed_response.length).to eq 2
       end
     end
 
@@ -65,13 +85,17 @@ describe Projects::Boards::IssuesController do
       end
     end
 
-    def list_issues(user:, board:, list:)
+    def list_issues(user:, board:, list: nil)
       sign_in(user)
 
-      get :index, namespace_id: project.namespace.to_param,
-                  project_id: project.to_param,
-                  board_id: board.to_param,
-                  list_id: list.to_param
+      params = {
+        namespace_id: project.namespace.to_param,
+        project_id: project.to_param,
+        board_id: board.to_param,
+        list_id: list.try(:to_param)
+      }
+
+      get :index, params.compact
     end
   end
 
diff --git a/spec/controllers/projects/boards/lists_controller_spec.rb b/spec/controllers/projects/boards/lists_controller_spec.rb
index 34d6119429d..b3f9f76a50c 100644
--- a/spec/controllers/projects/boards/lists_controller_spec.rb
+++ b/spec/controllers/projects/boards/lists_controller_spec.rb
@@ -27,7 +27,7 @@ describe Projects::Boards::ListsController do
       parsed_response = JSON.parse(response.body)
 
       expect(response).to match_response_schema('lists')
-      expect(parsed_response.length).to eq 3
+      expect(parsed_response.length).to eq 2
     end
 
     context 'with unauthorized user' do
diff --git a/spec/controllers/projects/templates_controller_spec.rb b/spec/controllers/projects/templates_controller_spec.rb
index 99d0bcfa8d1..80f84a388ce 100644
--- a/spec/controllers/projects/templates_controller_spec.rb
+++ b/spec/controllers/projects/templates_controller_spec.rb
@@ -14,7 +14,8 @@ describe Projects::TemplatesController do
 
   before do
     project.add_user(user, Gitlab::Access::MASTER)
-    project.repository.commit_file(user, file_path_1, "something valid", "test 3", "master", false)
+    project.repository.commit_file(user, file_path_1, 'something valid',
+      message: 'test 3', branch_name: 'master', update: false)
   end
 
   describe '#show' do
diff --git a/spec/factories/boards.rb b/spec/factories/boards.rb
index ec46146d9b5..a581725245a 100644
--- a/spec/factories/boards.rb
+++ b/spec/factories/boards.rb
@@ -3,7 +3,6 @@ FactoryGirl.define do
     project factory: :empty_project
 
     after(:create) do |board|
-      board.lists.create(list_type: :backlog)
       board.lists.create(list_type: :done)
     end
   end
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index 9e3f06c682c..2a2f3cca91c 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -6,12 +6,6 @@ FactoryGirl.define do
     sequence(:position)
   end
 
-  factory :backlog_list, parent: :list do
-    list_type :backlog
-    label nil
-    position nil
-  end
-
   factory :done_list, parent: :list do
     list_type :done
     label nil
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 992580a6b34..715b2a27b30 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -106,6 +106,42 @@ FactoryGirl.define do
     path { 'gitlabhq' }
 
     test_repo
+
+    transient do
+      create_template nil
+    end
+
+    after :create do |project, evaluator|
+      TestEnv.copy_repo(project)
+
+      if evaluator.create_template
+        args = evaluator.create_template
+
+        project.add_user(args[:user], args[:access])
+
+        project.repository.commit_file(
+          args[:user],
+          ".gitlab/#{args[:path]}/bug.md",
+          'something valid',
+          message: 'test 3',
+          branch_name: 'master',
+          update: false)
+        project.repository.commit_file(
+          args[:user],
+          ".gitlab/#{args[:path]}/template_test.md",
+          'template_test',
+          message: 'test 1',
+          branch_name: 'master',
+          update: false)
+        project.repository.commit_file(
+          args[:user],
+          ".gitlab/#{args[:path]}/feature_proposal.md",
+          'feature_proposal',
+          message: 'test 2',
+          branch_name: 'master',
+          update: false)
+      end
+    end
   end
 
   factory :forked_project_with_submodules, parent: :empty_project do
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index e177059d959..9d5ce876c29 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -9,8 +9,8 @@ describe 'Admin Builds' do
     let(:pipeline) { create(:ci_pipeline) }
 
     context 'All tab' do
-      context 'when have builds' do
-        it 'shows all builds' do
+      context 'when have jobs' do
+        it 'shows all jobs' do
           create(:ci_build, pipeline: pipeline, status: :pending)
           create(:ci_build, pipeline: pipeline, status: :running)
           create(:ci_build, pipeline: pipeline, status: :success)
@@ -19,26 +19,26 @@ describe 'Admin Builds' do
           visit admin_builds_path
 
           expect(page).to have_selector('.nav-links li.active', text: 'All')
-          expect(page).to have_selector('.row-content-block', text: 'All builds')
+          expect(page).to have_selector('.row-content-block', text: 'All jobs')
           expect(page.all('.build-link').size).to eq(4)
           expect(page).to have_link 'Cancel all'
         end
       end
 
-      context 'when have no builds' do
+      context 'when have no jobs' do
         it 'shows a message' do
           visit admin_builds_path
 
           expect(page).to have_selector('.nav-links li.active', text: 'All')
-          expect(page).to have_content 'No builds to show'
+          expect(page).to have_content 'No jobs to show'
           expect(page).not_to have_link 'Cancel all'
         end
       end
     end
 
     context 'Pending tab' do
-      context 'when have pending builds' do
-        it 'shows pending builds' do
+      context 'when have pending jobs' do
+        it 'shows pending jobs' do
           build1 = create(:ci_build, pipeline: pipeline, status: :pending)
           build2 = create(:ci_build, pipeline: pipeline, status: :running)
           build3 = create(:ci_build, pipeline: pipeline, status: :success)
@@ -55,22 +55,22 @@ describe 'Admin Builds' do
         end
       end
 
-      context 'when have no builds pending' do
+      context 'when have no jobs pending' do
         it 'shows a message' do
           create(:ci_build, pipeline: pipeline, status: :success)
 
           visit admin_builds_path(scope: :pending)
 
           expect(page).to have_selector('.nav-links li.active', text: 'Pending')
-          expect(page).to have_content 'No builds to show'
+          expect(page).to have_content 'No jobs to show'
           expect(page).not_to have_link 'Cancel all'
         end
       end
     end
 
     context 'Running tab' do
-      context 'when have running builds' do
-        it 'shows running builds' do
+      context 'when have running jobs' do
+        it 'shows running jobs' do
           build1 = create(:ci_build, pipeline: pipeline, status: :running)
           build2 = create(:ci_build, pipeline: pipeline, status: :success)
           build3 = create(:ci_build, pipeline: pipeline, status: :failed)
@@ -87,22 +87,22 @@ describe 'Admin Builds' do
         end
       end
 
-      context 'when have no builds running' do
+      context 'when have no jobs running' do
         it 'shows a message' do
           create(:ci_build, pipeline: pipeline, status: :success)
 
           visit admin_builds_path(scope: :running)
 
           expect(page).to have_selector('.nav-links li.active', text: 'Running')
-          expect(page).to have_content 'No builds to show'
+          expect(page).to have_content 'No jobs to show'
           expect(page).not_to have_link 'Cancel all'
         end
       end
     end
 
     context 'Finished tab' do
-      context 'when have finished builds' do
-        it 'shows finished builds' do
+      context 'when have finished jobs' do
+        it 'shows finished jobs' do
           build1 = create(:ci_build, pipeline: pipeline, status: :pending)
           build2 = create(:ci_build, pipeline: pipeline, status: :running)
           build3 = create(:ci_build, pipeline: pipeline, status: :success)
@@ -117,14 +117,14 @@ describe 'Admin Builds' do
         end
       end
 
-      context 'when have no builds finished' do
+      context 'when have no jobs finished' do
         it 'shows a message' do
           create(:ci_build, pipeline: pipeline, status: :running)
 
           visit admin_builds_path(scope: :finished)
 
           expect(page).to have_selector('.nav-links li.active', text: 'Finished')
-          expect(page).to have_content 'No builds to show'
+          expect(page).to have_content 'No jobs to show'
           expect(page).to have_link 'Cancel all'
         end
       end
diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb
new file mode 100644
index 00000000000..2875fc1e533
--- /dev/null
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -0,0 +1,233 @@
+require 'rails_helper'
+
+describe 'Issue Boards add issue modal', :feature, :js do
+  include WaitForAjax
+  include WaitForVueResource
+
+  let(:project) { create(:empty_project, :public) }
+  let(:board) { create(:board, project: project) }
+  let(:user) { create(:user) }
+  let!(:planning) { create(:label, project: project, name: 'Planning') }
+  let!(:label) { create(:label, project: project) }
+  let!(:list1) { create(:list, board: board, label: planning, position: 0) }
+  let!(:list2) { create(:list, board: board, label: label, position: 1) }
+  let!(:issue) { create(:issue, project: project) }
+  let!(:issue2) { create(:issue, project: project) }
+
+  before do
+    project.team << [user, :master]
+
+    login_as(user)
+
+    visit namespace_project_board_path(project.namespace, project, board)
+    wait_for_vue_resource
+  end
+
+  context 'modal interaction' do
+    it 'opens modal' do
+      click_button('Add issues')
+
+      expect(page).to have_selector('.add-issues-modal')
+    end
+
+    it 'closes modal' do
+      click_button('Add issues')
+
+      page.within('.add-issues-modal') do
+        find('.close').click
+      end
+
+      expect(page).not_to have_selector('.add-issues-modal')
+    end
+
+    it 'closes modal if cancel button clicked' do
+      click_button('Add issues')
+
+      page.within('.add-issues-modal') do
+        click_button 'Cancel'
+      end
+
+      expect(page).not_to have_selector('.add-issues-modal')
+    end
+  end
+
+  context 'issues list' do
+    before do
+      click_button('Add issues')
+
+      wait_for_vue_resource
+    end
+
+    it 'loads issues' do
+      page.within('.add-issues-modal') do
+        page.within('.nav-links') do
+          expect(page).to have_content('2')
+        end
+
+        expect(page).to have_selector('.card', count: 2)
+      end
+    end
+
+    it 'shows selected issues' do
+      page.within('.add-issues-modal') do
+        click_link 'Selected issues'
+
+        expect(page).not_to have_selector('.card')
+      end
+    end
+
+    context 'list dropdown' do
+      it 'resets after deleting list' do
+        page.within('.add-issues-modal') do
+          expect(find('.add-issues-footer')).to have_button(planning.title)
+
+          click_button 'Cancel'
+        end
+
+        first('.board-delete').click
+
+        click_button('Add issues')
+
+        wait_for_vue_resource
+
+        page.within('.add-issues-modal') do
+          expect(find('.add-issues-footer')).not_to have_button(planning.title)
+          expect(find('.add-issues-footer')).to have_button(label.title)
+        end
+      end
+    end
+
+    context 'search' do
+      it 'returns issues' do
+        page.within('.add-issues-modal') do
+          find('.form-control').native.send_keys(issue.title)
+
+          expect(page).to have_selector('.card', count: 1)
+        end
+      end
+
+      it 'returns no issues' do
+        page.within('.add-issues-modal') do
+          find('.form-control').native.send_keys('testing search')
+
+          expect(page).not_to have_selector('.card')
+          expect(page).not_to have_content("You haven't added any issues to your project yet")
+        end
+      end
+    end
+
+    context 'selecing issues' do
+      it 'selects single issue' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          page.within('.nav-links') do
+            expect(page).to have_content('Selected issues 1')
+          end
+        end
+      end
+
+      it 'changes button text' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          expect(first('.add-issues-footer .btn')).to have_content('Add 1 issue')
+        end
+      end
+
+      it 'changes button text with plural' do
+        page.within('.add-issues-modal') do
+          all('.card').each do |el|
+            el.click
+          end
+
+          expect(first('.add-issues-footer .btn')).to have_content('Add 2 issues')
+        end
+      end
+
+      it 'shows only selected issues on selected tab' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          click_link 'Selected issues'
+
+          expect(page).to have_selector('.card', count: 1)
+        end
+      end
+
+      it 'selects all issues' do
+        page.within('.add-issues-modal') do
+          click_button 'Select all'
+
+          expect(page).to have_selector('.is-active', count: 2)
+        end
+      end
+
+      it 'deselects all issues' do
+        page.within('.add-issues-modal') do
+          click_button 'Select all'
+
+          expect(page).to have_selector('.is-active', count: 2)
+
+          click_button 'Deselect all'
+
+          expect(page).not_to have_selector('.is-active')
+        end
+      end
+
+      it 'selects all that arent already selected' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          expect(page).to have_selector('.is-active', count: 1)
+
+          click_button 'Select all'
+
+          expect(page).to have_selector('.is-active', count: 2)
+        end
+      end
+
+      it 'unselects from selected tab' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          click_link 'Selected issues'
+
+          first('.card').click
+
+          expect(page).not_to have_selector('.is-active')
+        end
+      end
+    end
+
+    context 'adding issues' do
+      it 'adds to board' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          click_button 'Add 1 issue'
+        end
+
+        page.within(first('.board')) do
+          expect(page).to have_selector('.card')
+        end
+      end
+
+      it 'adds to second list' do
+        page.within('.add-issues-modal') do
+          first('.card').click
+
+          click_button planning.title
+
+          click_link label.title
+
+          click_button 'Add 1 issue'
+        end
+
+        page.within(find('.board:nth-child(2)')) do
+          expect(page).to have_selector('.card')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index bfac5a1b8ab..34f47daf0e5 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -20,7 +20,7 @@ describe 'Issue Boards', feature: true, js: true do
     before do
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_vue_resource
-      expect(page).to have_selector('.board', count: 3)
+      expect(page).to have_selector('.board', count: 2)
     end
 
     it 'shows blank state' do
@@ -31,18 +31,18 @@ describe 'Issue Boards', feature: true, js: true do
       page.within(find('.board-blank-state')) do
         click_button("Nevermind, I'll use my own")
       end
-      expect(page).to have_selector('.board', count: 2)
+      expect(page).to have_selector('.board', count: 1)
     end
 
     it 'creates default lists' do
-      lists = ['Backlog', 'To Do', 'Doing', 'Done']
+      lists = ['To Do', 'Doing', 'Done']
 
       page.within(find('.board-blank-state')) do
         click_button('Add default lists')
       end
       wait_for_vue_resource
 
-      expect(page).to have_selector('.board', count: 4)
+      expect(page).to have_selector('.board', count: 3)
 
       page.all('.board').each_with_index do |list, i|
         expect(list.find('.board-title')).to have_content(lists[i])
@@ -64,42 +64,41 @@ describe 'Issue Boards', feature: true, js: true do
     let!(:list1) { create(:list, board: board, label: planning, position: 0) }
     let!(:list2) { create(:list, board: board, label: development, position: 1) }
 
-    let!(:confidential_issue) { create(:issue, :confidential, project: project, author: user) }
-    let!(:issue1) { create(:issue, project: project, assignee: user) }
-    let!(:issue2) { create(:issue, project: project, author: user2) }
-    let!(:issue3) { create(:issue, project: project) }
-    let!(:issue4) { create(:issue, project: project) }
+    let!(:confidential_issue) { create(:labeled_issue, :confidential, project: project, author: user, labels: [planning]) }
+    let!(:issue1) { create(:labeled_issue, project: project, assignee: user, labels: [planning]) }
+    let!(:issue2) { create(:labeled_issue, project: project, author: user2, labels: [planning]) }
+    let!(:issue3) { create(:labeled_issue, project: project, labels: [planning]) }
+    let!(:issue4) { create(:labeled_issue, project: project, labels: [planning]) }
     let!(:issue5) { create(:labeled_issue, project: project, labels: [planning], milestone: milestone) }
     let!(:issue6) { create(:labeled_issue, project: project, labels: [planning, development]) }
     let!(:issue7) { create(:labeled_issue, project: project, labels: [development]) }
     let!(:issue8) { create(:closed_issue, project: project) }
-    let!(:issue9) { create(:labeled_issue, project: project, labels: [testing, bug, accepting]) }
+    let!(:issue9) { create(:labeled_issue, project: project, labels: [planning, testing, bug, accepting]) }
 
     before do
       visit namespace_project_board_path(project.namespace, project, board)
 
       wait_for_vue_resource
 
-      expect(page).to have_selector('.board', count: 4)
+      expect(page).to have_selector('.board', count: 3)
       expect(find('.board:nth-child(1)')).to have_selector('.card')
       expect(find('.board:nth-child(2)')).to have_selector('.card')
       expect(find('.board:nth-child(3)')).to have_selector('.card')
-      expect(find('.board:nth-child(4)')).to have_selector('.card')
     end
 
     it 'shows lists' do
-      expect(page).to have_selector('.board', count: 4)
+      expect(page).to have_selector('.board', count: 3)
     end
 
     it 'shows description tooltip on list title' do
-      page.within('.board:nth-child(2)') do
+      page.within('.board:nth-child(1)') do
         expect(find('.board-title span.has-tooltip')[:title]).to eq('Test')
       end
     end
 
     it 'shows issues in lists' do
+      wait_for_board_cards(1, 8)
       wait_for_board_cards(2, 2)
-      wait_for_board_cards(3, 2)
     end
 
     it 'shows confidential issues with icon' do
@@ -108,19 +107,6 @@ describe 'Issue Boards', feature: true, js: true do
       end
     end
 
-    it 'search backlog list' do
-      page.within('#js-boards-search') do
-        find('.form-control').set(issue1.title)
-      end
-
-      wait_for_vue_resource
-
-      expect(find('.board:nth-child(1)')).to have_selector('.card', count: 1)
-      expect(find('.board:nth-child(2)')).to have_selector('.card', count: 0)
-      expect(find('.board:nth-child(3)')).to have_selector('.card', count: 0)
-      expect(find('.board:nth-child(4)')).to have_selector('.card', count: 0)
-    end
-
     it 'search done list' do
       page.within('#js-boards-search') do
         find('.form-control').set(issue8.title)
@@ -130,8 +116,7 @@ describe 'Issue Boards', feature: true, js: true do
 
       expect(find('.board:nth-child(1)')).to have_selector('.card', count: 0)
       expect(find('.board:nth-child(2)')).to have_selector('.card', count: 0)
-      expect(find('.board:nth-child(3)')).to have_selector('.card', count: 0)
-      expect(find('.board:nth-child(4)')).to have_selector('.card', count: 1)
+      expect(find('.board:nth-child(3)')).to have_selector('.card', count: 1)
     end
 
     it 'search list' do
@@ -141,157 +126,135 @@ describe 'Issue Boards', feature: true, js: true do
 
       wait_for_vue_resource
 
-      expect(find('.board:nth-child(1)')).to have_selector('.card', count: 0)
-      expect(find('.board:nth-child(2)')).to have_selector('.card', count: 1)
+      expect(find('.board:nth-child(1)')).to have_selector('.card', count: 1)
+      expect(find('.board:nth-child(2)')).to have_selector('.card', count: 0)
       expect(find('.board:nth-child(3)')).to have_selector('.card', count: 0)
-      expect(find('.board:nth-child(4)')).to have_selector('.card', count: 0)
     end
 
     it 'allows user to delete board' do
-      page.within(find('.board:nth-child(2)')) do
+      page.within(find('.board:nth-child(1)')) do
         find('.board-delete').click
       end
 
       wait_for_vue_resource
 
-      expect(page).to have_selector('.board', count: 3)
+      expect(page).to have_selector('.board', count: 2)
     end
 
     it 'removes checkmark in new list dropdown after deleting' do
       click_button 'Add list'
       wait_for_ajax
 
-      page.within(find('.board:nth-child(2)')) do
+      page.within(find('.board:nth-child(1)')) do
         find('.board-delete').click
       end
 
       wait_for_vue_resource
 
-      expect(page).to have_selector('.board', count: 3)
-      expect(find(".js-board-list-#{planning.id}", visible: false)).not_to have_css('.is-active')
+      expect(page).to have_selector('.board', count: 2)
     end
 
     it 'infinite scrolls list' do
       50.times do
-        create(:issue, project: project)
+        create(:labeled_issue, project: project, labels: [planning])
       end
 
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_vue_resource
 
       page.within(find('.board', match: :first)) do
-        expect(page.find('.board-header')).to have_content('56')
+        expect(page.find('.board-header')).to have_content('58')
         expect(page).to have_selector('.card', count: 20)
-        expect(page).to have_content('Showing 20 of 56 issues')
+        expect(page).to have_content('Showing 20 of 58 issues')
 
         evaluate_script("document.querySelectorAll('.board .board-list')[0].scrollTop = document.querySelectorAll('.board .board-list')[0].scrollHeight")
         wait_for_vue_resource
 
         expect(page).to have_selector('.card', count: 40)
-        expect(page).to have_content('Showing 40 of 56 issues')
+        expect(page).to have_content('Showing 40 of 58 issues')
 
         evaluate_script("document.querySelectorAll('.board .board-list')[0].scrollTop = document.querySelectorAll('.board .board-list')[0].scrollHeight")
         wait_for_vue_resource
 
-        expect(page).to have_selector('.card', count: 56)
+        expect(page).to have_selector('.card', count: 58)
         expect(page).to have_content('Showing all issues')
       end
     end
 
-    context 'backlog' do
-      it 'shows issues in backlog with no labels' do
-        wait_for_board_cards(1, 6)
-      end
-
-      it 'moves issue from backlog into list' do
-        drag_to(list_to_index: 1)
-
-        wait_for_vue_resource
-        wait_for_board_cards(1, 5)
-        wait_for_board_cards(2, 3)
-      end
-    end
-
     context 'done' do
       it 'shows list of done issues' do
-        wait_for_board_cards(4, 1)
+        wait_for_board_cards(3, 1)
         wait_for_ajax
       end
 
       it 'moves issue to done' do
-        drag_to(list_from_index: 0, list_to_index: 3)
+        drag_to(list_from_index: 0, list_to_index: 2)
 
-        wait_for_board_cards(1, 5)
+        wait_for_board_cards(1, 7)
         wait_for_board_cards(2, 2)
         wait_for_board_cards(3, 2)
-        wait_for_board_cards(4, 2)
 
         expect(find('.board:nth-child(1)')).not_to have_content(issue9.title)
-        expect(find('.board:nth-child(4)')).to have_selector('.card', count: 2)
-        expect(find('.board:nth-child(4)')).to have_content(issue9.title)
-        expect(find('.board:nth-child(4)')).not_to have_content(planning.title)
+        expect(find('.board:nth-child(3)')).to have_selector('.card', count: 2)
+        expect(find('.board:nth-child(3)')).to have_content(issue9.title)
+        expect(find('.board:nth-child(3)')).not_to have_content(planning.title)
       end
 
       it 'removes all of the same issue to done' do
-        drag_to(list_from_index: 1, list_to_index: 3)
+        drag_to(list_from_index: 0, list_to_index: 2)
 
-        wait_for_board_cards(1, 6)
-        wait_for_board_cards(2, 1)
-        wait_for_board_cards(3, 1)
-        wait_for_board_cards(4, 2)
+        wait_for_board_cards(1, 7)
+        wait_for_board_cards(2, 2)
+        wait_for_board_cards(3, 2)
 
-        expect(find('.board:nth-child(2)')).not_to have_content(issue6.title)
-        expect(find('.board:nth-child(4)')).to have_content(issue6.title)
-        expect(find('.board:nth-child(4)')).not_to have_content(planning.title)
+        expect(find('.board:nth-child(1)')).not_to have_content(issue9.title)
+        expect(find('.board:nth-child(3)')).to have_content(issue9.title)
+        expect(find('.board:nth-child(3)')).not_to have_content(planning.title)
       end
     end
 
     context 'lists' do
       it 'changes position of list' do
-        drag_to(list_from_index: 1, list_to_index: 2, selector: '.board-header')
+        drag_to(list_from_index: 1, list_to_index: 0, selector: '.board-header')
 
-        wait_for_board_cards(1, 6)
-        wait_for_board_cards(2, 2)
-        wait_for_board_cards(3, 2)
-        wait_for_board_cards(4, 1)
+        wait_for_board_cards(1, 2)
+        wait_for_board_cards(2, 8)
+        wait_for_board_cards(3, 1)
 
-        expect(find('.board:nth-child(2)')).to have_content(development.title)
-        expect(find('.board:nth-child(2)')).to have_content(planning.title)
+        expect(find('.board:nth-child(1)')).to have_content(development.title)
+        expect(find('.board:nth-child(1)')).to have_content(planning.title)
       end
 
       it 'issue moves between lists' do
-        drag_to(list_from_index: 1, card_index: 1, list_to_index: 2)
+        drag_to(list_from_index: 0, card_index: 1, list_to_index: 1)
 
-        wait_for_board_cards(1, 6)
-        wait_for_board_cards(2, 1)
-        wait_for_board_cards(3, 3)
-        wait_for_board_cards(4, 1)
+        wait_for_board_cards(1, 7)
+        wait_for_board_cards(2, 2)
+        wait_for_board_cards(3, 1)
 
-        expect(find('.board:nth-child(3)')).to have_content(issue6.title)
-        expect(find('.board:nth-child(3)').all('.card').last).not_to have_content(development.title)
+        expect(find('.board:nth-child(2)')).to have_content(issue6.title)
+        expect(find('.board:nth-child(2)').all('.card').last).not_to have_content(development.title)
       end
 
       it 'issue moves between lists' do
-        drag_to(list_from_index: 2, list_to_index: 1)
+        drag_to(list_from_index: 1, list_to_index: 0)
 
-        wait_for_board_cards(1, 6)
-        wait_for_board_cards(2, 3)
+        wait_for_board_cards(1, 9)
+        wait_for_board_cards(2, 1)
         wait_for_board_cards(3, 1)
-        wait_for_board_cards(4, 1)
 
-        expect(find('.board:nth-child(2)')).to have_content(issue7.title)
-        expect(find('.board:nth-child(2)').all('.card').first).not_to have_content(planning.title)
+        expect(find('.board:nth-child(1)')).to have_content(issue7.title)
+        expect(find('.board:nth-child(1)').all('.card').first).not_to have_content(planning.title)
       end
 
       it 'issue moves from done' do
-        drag_to(list_from_index: 3, list_to_index: 1)
+        drag_to(list_from_index: 2, list_to_index: 1)
 
         expect(find('.board:nth-child(2)')).to have_content(issue8.title)
 
-        wait_for_board_cards(1, 6)
+        wait_for_board_cards(1, 8)
         wait_for_board_cards(2, 3)
-        wait_for_board_cards(3, 2)
-        wait_for_board_cards(4, 0)
+        wait_for_board_cards(3, 0)
       end
 
       context 'issue card' do
@@ -324,7 +287,7 @@ describe 'Issue Boards', feature: true, js: true do
 
           wait_for_vue_resource
 
-          expect(page).to have_selector('.board', count: 5)
+          expect(page).to have_selector('.board', count: 4)
         end
 
         it 'creates new list for Backlog label' do
@@ -337,7 +300,7 @@ describe 'Issue Boards', feature: true, js: true do
 
           wait_for_vue_resource
 
-          expect(page).to have_selector('.board', count: 5)
+          expect(page).to have_selector('.board', count: 4)
         end
 
         it 'creates new list for Done label' do
@@ -350,7 +313,7 @@ describe 'Issue Boards', feature: true, js: true do
 
           wait_for_vue_resource
 
-          expect(page).to have_selector('.board', count: 5)
+          expect(page).to have_selector('.board', count: 4)
         end
 
         it 'keeps dropdown open after adding new list' do
@@ -366,21 +329,6 @@ describe 'Issue Boards', feature: true, js: true do
           expect(find('.issue-boards-search')).to have_selector('.open')
         end
 
-        it 'moves issues from backlog into new list' do
-          wait_for_board_cards(1, 6)
-
-          click_button 'Add list'
-          wait_for_ajax
-
-          page.within('.dropdown-menu-issues-board-new') do
-            click_link testing.title
-          end
-
-          wait_for_vue_resource
-
-          wait_for_board_cards(1, 5)
-        end
-
         it 'creates new list from a new label' do
           click_button 'Add list'
 
@@ -397,7 +345,7 @@ describe 'Issue Boards', feature: true, js: true do
           wait_for_ajax
           wait_for_vue_resource
 
-          expect(page).to have_selector('.board', count: 5)
+          expect(page).to have_selector('.board', count: 4)
         end
       end
     end
@@ -418,7 +366,7 @@ describe 'Issue Boards', feature: true, js: true do
 
         wait_for_vue_resource
         wait_for_board_cards(1, 1)
-        wait_for_empty_boards((2..4))
+        wait_for_empty_boards((2..3))
       end
 
       it 'filters by assignee' do
@@ -437,7 +385,7 @@ describe 'Issue Boards', feature: true, js: true do
         wait_for_vue_resource
 
         wait_for_board_cards(1, 1)
-        wait_for_empty_boards((2..4))
+        wait_for_empty_boards((2..3))
       end
 
       it 'filters by milestone' do
@@ -454,10 +402,9 @@ describe 'Issue Boards', feature: true, js: true do
         end
 
         wait_for_vue_resource
-        wait_for_board_cards(1, 0)
-        wait_for_board_cards(2, 1)
+        wait_for_board_cards(1, 1)
+        wait_for_board_cards(2, 0)
         wait_for_board_cards(3, 0)
-        wait_for_board_cards(4, 0)
       end
 
       it 'filters by label' do
@@ -474,7 +421,7 @@ describe 'Issue Boards', feature: true, js: true do
 
         wait_for_vue_resource
         wait_for_board_cards(1, 1)
-        wait_for_empty_boards((2..4))
+        wait_for_empty_boards((2..3))
       end
 
       it 'filters by label with space after reload' do
@@ -530,7 +477,7 @@ describe 'Issue Boards', feature: true, js: true do
 
       it 'infinite scrolls list with label filter' do
         50.times do
-          create(:labeled_issue, project: project, labels: [testing])
+          create(:labeled_issue, project: project, labels: [planning, testing])
         end
 
         page.within '.issues-filters' do
@@ -580,32 +527,12 @@ describe 'Issue Boards', feature: true, js: true do
         wait_for_vue_resource
 
         wait_for_board_cards(1, 1)
-        wait_for_empty_boards((2..4))
-      end
-
-      it 'filters by no label' do
-        page.within '.issues-filters' do
-          click_button('Label')
-          wait_for_ajax
-
-          page.within '.dropdown-menu-labels' do
-            click_link("No Label")
-            wait_for_vue_resource
-            find('.dropdown-menu-close').click
-          end
-        end
-
-        wait_for_vue_resource
-
-        wait_for_board_cards(1, 5)
-        wait_for_board_cards(2, 0)
-        wait_for_board_cards(3, 0)
-        wait_for_board_cards(4, 1)
+        wait_for_empty_boards((2..3))
       end
 
       it 'filters by clicking label button on issue' do
         page.within(find('.board', match: :first)) do
-          expect(page).to have_selector('.card', count: 6)
+          expect(page).to have_selector('.card', count: 8)
           expect(find('.card', match: :first)).to have_content(bug.title)
           click_button(bug.title)
           wait_for_vue_resource
@@ -614,7 +541,7 @@ describe 'Issue Boards', feature: true, js: true do
         wait_for_vue_resource
 
         wait_for_board_cards(1, 1)
-        wait_for_empty_boards((2..4))
+        wait_for_empty_boards((2..3))
 
         page.within('.labels-filter') do
           expect(find('.dropdown-toggle-text')).to have_content(bug.title)
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index a03cd6fbf2d..6d14a8cf483 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -6,6 +6,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
 
   let(:project) { create(:empty_project, :public) }
   let(:board)   { create(:board, project: project) }
+  let!(:list)   { create(:list, board: board, position: 0) }
   let(:user)    { create(:user) }
 
   context 'authorized user' do
@@ -17,7 +18,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_vue_resource
 
-      expect(page).to have_selector('.board', count: 3)
+      expect(page).to have_selector('.board', count: 2)
     end
 
     it 'displays new issue button' do
@@ -25,7 +26,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
     end
 
     it 'does not display new issue button in done list' do
-      page.within('.board:nth-child(3)') do
+      page.within('.board:nth-child(2)') do
         expect(page).not_to have_selector('.board-issue-count-holder .btn')
       end
     end
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index c28bb0dcdae..9cc50167395 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -4,14 +4,17 @@ describe 'Issue Boards', feature: true, js: true do
   include WaitForAjax
   include WaitForVueResource
 
-  let(:project)     { create(:empty_project, :public) }
-  let(:board)       { create(:board, project: project) }
-  let(:user)        { create(:user) }
-  let!(:label)      { create(:label, project: project) }
-  let!(:label2)     { create(:label, project: project) }
-  let!(:milestone)  { create(:milestone, project: project) }
-  let!(:issue2)     { create(:labeled_issue, project: project, assignee: user, milestone: milestone, labels: [label]) }
-  let!(:issue)      { create(:issue, project: project) }
+  let(:user)         { create(:user) }
+  let(:project)      { create(:empty_project, :public) }
+  let!(:milestone)   { create(:milestone, project: project) }
+  let!(:development) { create(:label, project: project, name: 'Development') }
+  let!(:bug)         { create(:label, project: project, name: 'Bug') }
+  let!(:regression)  { create(:label, project: project, name: 'Regression') }
+  let!(:stretch)     { create(:label, project: project, name: 'Stretch') }
+  let!(:issue1)      { create(:labeled_issue, project: project, assignee: user, milestone: milestone, labels: [development]) }
+  let!(:issue2)      { create(:labeled_issue, project: project, labels: [development, stretch]) }
+  let(:board)        { create(:board, project: project) }
+  let!(:list)        { create(:list, board: board, label: development, position: 0) }
 
   before do
     project.team << [user, :master]
@@ -62,8 +65,22 @@ describe 'Issue Boards', feature: true, js: true do
     end
 
     page.within('.issue-boards-sidebar') do
-      expect(page).to have_content(issue.title)
-      expect(page).to have_content(issue.to_reference)
+      expect(page).to have_content(issue2.title)
+      expect(page).to have_content(issue2.to_reference)
+    end
+  end
+
+  it 'removes card from board when clicking remove button' do
+    page.within(first('.board')) do
+      first('.card').click
+    end
+
+    page.within('.issue-boards-sidebar') do
+      click_button 'Remove from board'
+    end
+
+    page.within(first('.board')) do
+      expect(page).to have_selector('.card', count: 1)
     end
   end
 
@@ -244,22 +261,22 @@ describe 'Issue Boards', feature: true, js: true do
 
         wait_for_ajax
 
-        click_link label.title
+        click_link bug.title
 
         wait_for_vue_resource
 
         find('.dropdown-menu-close-icon').click
 
         page.within('.value') do
-          expect(page).to have_selector('.label', count: 1)
-          expect(page).to have_content(label.title)
+          expect(page).to have_selector('.label', count: 3)
+          expect(page).to have_content(bug.title)
         end
       end
 
       page.within(first('.board')) do
         page.within(first('.card')) do
-          expect(page).to have_selector('.label', count: 1)
-          expect(page).to have_content(label.title)
+          expect(page).to have_selector('.label', count: 2)
+          expect(page).to have_content(bug.title)
         end
       end
     end
@@ -274,32 +291,32 @@ describe 'Issue Boards', feature: true, js: true do
 
         wait_for_ajax
 
-        click_link label.title
-        click_link label2.title
+        click_link bug.title
+        click_link regression.title
 
         wait_for_vue_resource
 
         find('.dropdown-menu-close-icon').click
 
         page.within('.value') do
-          expect(page).to have_selector('.label', count: 2)
-          expect(page).to have_content(label.title)
-          expect(page).to have_content(label2.title)
+          expect(page).to have_selector('.label', count: 4)
+          expect(page).to have_content(bug.title)
+          expect(page).to have_content(regression.title)
         end
       end
 
       page.within(first('.board')) do
         page.within(first('.card')) do
-          expect(page).to have_selector('.label', count: 2)
-          expect(page).to have_content(label.title)
-          expect(page).to have_content(label2.title)
+          expect(page).to have_selector('.label', count: 3)
+          expect(page).to have_content(bug.title)
+          expect(page).to have_content(regression.title)
         end
       end
     end
 
     it 'removes a label' do
       page.within(first('.board')) do
-        find('.card:nth-child(2)').click
+        first('.card').click
       end
 
       page.within('.labels') do
@@ -307,22 +324,22 @@ describe 'Issue Boards', feature: true, js: true do
 
         wait_for_ajax
 
-        click_link label.title
+        click_link stretch.title
 
         wait_for_vue_resource
 
         find('.dropdown-menu-close-icon').click
 
         page.within('.value') do
-          expect(page).to have_selector('.label', count: 0)
-          expect(page).not_to have_content(label.title)
+          expect(page).to have_selector('.label', count: 1)
+          expect(page).not_to have_content(stretch.title)
         end
       end
 
       page.within(first('.board')) do
-        page.within(find('.card:nth-child(2)')) do
-          expect(page).not_to have_selector('.label', count: 1)
-          expect(page).not_to have_content(label.title)
+        page.within(first('.card')) do
+          expect(page).not_to have_selector('.label')
+          expect(page).not_to have_content(stretch.title)
         end
       end
     end
diff --git a/spec/features/issues/group_label_sidebar_spec.rb b/spec/features/issues/group_label_sidebar_spec.rb
new file mode 100644
index 00000000000..fc8515cfe9b
--- /dev/null
+++ b/spec/features/issues/group_label_sidebar_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+describe 'Group label on issue', :feature do
+  it 'renders link to the project issues page' do
+    group = create(:group)
+    project = create(:empty_project, :public, namespace: group)
+    feature = create(:group_label, group: group, title: 'feature')
+    issue = create(:labeled_issue, project: project, labels: [feature])
+    label_link = namespace_project_issues_path(
+      project.namespace,
+      project,
+      label_name: [feature.name]
+    )
+
+    visit namespace_project_issue_path(project.namespace, project, issue)
+
+    link = find('.issuable-show-labels a')
+
+    expect(link[:href]).to eq(label_link)
+  end
+end
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
index 7e2907cd26f..d2f5c4afc93 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
@@ -50,7 +50,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
           visit_merge_request(merge_request)
 
           expect(page).not_to have_button 'Accept Merge Request'
-          expect(page).to have_content('Please retry the build or push a new commit to fix the failure.')
+          expect(page).to have_content('Please retry the job or push a new commit to fix the failure.')
         end
       end
 
@@ -61,7 +61,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
           visit_merge_request(merge_request)
 
           expect(page).not_to have_button 'Accept Merge Request'
-          expect(page).to have_content('Please retry the build or push a new commit to fix the failure.')
+          expect(page).to have_content('Please retry the job or push a new commit to fix the failure.')
         end
       end
 
diff --git a/spec/features/merge_requests/user_uses_slash_commands_spec.rb b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
index 2582a540240..2b454b38231 100644
--- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb
+++ b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
@@ -120,5 +120,79 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do
         expect(page).not_to have_content '/due 2016-08-28'
       end
     end
+
+    describe '/target_branch command in merge request' do
+      let(:another_project) { create(:project, :public) }
+      let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
+
+      before do
+        logout
+        another_project.team << [user, :master]
+        login_with(user)
+      end
+
+      it 'changes target_branch in new merge_request' do
+        visit new_namespace_project_merge_request_path(another_project.namespace, another_project, new_url_opts)
+        fill_in "merge_request_title", with: 'My brand new feature'
+        fill_in "merge_request_description", with: "le feature \n/target_branch fix\nFeature description:"
+        click_button "Submit merge request"
+
+        merge_request = another_project.merge_requests.first
+        expect(merge_request.description).to eq "le feature \nFeature description:"
+        expect(merge_request.target_branch).to eq 'fix'
+      end
+
+      it 'does not change target branch when merge request is edited' do
+        new_merge_request = create(:merge_request, source_project: another_project)
+
+        visit edit_namespace_project_merge_request_path(another_project.namespace, another_project, new_merge_request)
+        fill_in "merge_request_description", with: "Want to update target branch\n/target_branch fix\n"
+        click_button "Save changes"
+
+        new_merge_request = another_project.merge_requests.first
+        expect(new_merge_request.description).to include('/target_branch')
+        expect(new_merge_request.target_branch).not_to eq('fix')
+      end
+    end
+
+    describe '/target_branch command from note' do
+      context 'when the current user can change target branch' do
+        it 'changes target branch from a note' do
+          write_note("message start \n/target_branch merge-test\n message end.")
+
+          expect(page).not_to have_content('/target_branch')
+          expect(page).to have_content('message start')
+          expect(page).to have_content('message end.')
+
+          expect(merge_request.reload.target_branch).to eq 'merge-test'
+        end
+
+        it 'does not fail when target branch does not exists' do
+          write_note('/target_branch totally_not_existing_branch')
+
+          expect(page).not_to have_content('/target_branch')
+
+          expect(merge_request.target_branch).to eq 'feature'
+        end
+      end
+
+      context 'when current user can not change target branch' do
+        let(:guest) { create(:user) }
+        before do
+          project.team << [guest, :guest]
+          logout
+          login_with(guest)
+          visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+        end
+
+        it 'does not change target branch' do
+          write_note('/target_branch merge-test')
+
+          expect(page).not_to have_content '/target_branch merge-test'
+
+          expect(merge_request.target_branch).to eq 'feature'
+        end
+      end
+    end
   end
 end
diff --git a/spec/features/projects/builds_spec.rb b/spec/features/projects/builds_spec.rb
index 11d27feab0b..f7e0115643e 100644
--- a/spec/features/projects/builds_spec.rb
+++ b/spec/features/projects/builds_spec.rb
@@ -27,7 +27,7 @@ feature 'Builds', :feature do
         visit namespace_project_builds_path(project.namespace, project, scope: :pending)
       end
 
-      it "shows Pending tab builds" do
+      it "shows Pending tab jobs" do
         expect(page).to have_link 'Cancel running'
         expect(page).to have_selector('.nav-links li.active', text: 'Pending')
         expect(page).to have_content build.short_sha
@@ -42,7 +42,7 @@ feature 'Builds', :feature do
         visit namespace_project_builds_path(project.namespace, project, scope: :running)
       end
 
-      it "shows Running tab builds" do
+      it "shows Running tab jobs" do
         expect(page).to have_selector('.nav-links li.active', text: 'Running')
         expect(page).to have_link 'Cancel running'
         expect(page).to have_content build.short_sha
@@ -57,20 +57,20 @@ feature 'Builds', :feature do
         visit namespace_project_builds_path(project.namespace, project, scope: :finished)
       end
 
-      it "shows Finished tab builds" do
+      it "shows Finished tab jobs" do
         expect(page).to have_selector('.nav-links li.active', text: 'Finished')
-        expect(page).to have_content 'No builds to show'
+        expect(page).to have_content 'No jobs to show'
         expect(page).to have_link 'Cancel running'
       end
     end
 
-    context "All builds" do
+    context "All jobs" do
       before do
         project.builds.running_or_pending.each(&:success)
         visit namespace_project_builds_path(project.namespace, project)
       end
 
-      it "shows All tab builds" do
+      it "shows All tab jobs" do
         expect(page).to have_selector('.nav-links li.active', text: 'All')
         expect(page).to have_content build.short_sha
         expect(page).to have_content build.ref
@@ -98,7 +98,7 @@ feature 'Builds', :feature do
   end
 
   describe "GET /:project/builds/:id" do
-    context "Build from project" do
+    context "Job from project" do
       before do
         visit namespace_project_build_path(project.namespace, project, build)
       end
@@ -111,7 +111,7 @@ feature 'Builds', :feature do
       end
     end
 
-    context "Build from other project" do
+    context "Job from other project" do
       before do
         visit namespace_project_build_path(project.namespace, project, build2)
       end
@@ -149,7 +149,7 @@ feature 'Builds', :feature do
       context 'when expire date is defined' do
         let(:expire_at) { Time.now + 7.days }
 
-        context 'when user has ability to update build' do
+        context 'when user has ability to update job' do
           it 'keeps artifacts when keep button is clicked' do
             expect(page).to have_content 'The artifacts will be removed'
 
@@ -160,7 +160,7 @@ feature 'Builds', :feature do
           end
         end
 
-        context 'when user does not have ability to update build' do
+        context 'when user does not have ability to update job' do
           let(:user_access_level) { :guest }
 
           it 'does not have keep button' do
@@ -197,8 +197,8 @@ feature 'Builds', :feature do
         visit namespace_project_build_path(project.namespace, project, build)
       end
 
-      context 'when build has an initial trace' do
-        it 'loads build trace' do
+      context 'when job has an initial trace' do
+        it 'loads job trace' do
           expect(page).to have_content 'BUILD TRACE'
 
           build.append_trace(' and more trace', 11)
@@ -242,32 +242,32 @@ feature 'Builds', :feature do
       end
     end
 
-    context 'when build starts environment' do
+    context 'when job starts environment' do
       let(:environment) { create(:environment, project: project) }
       let(:pipeline) { create(:ci_pipeline, project: project) }
 
-      context 'build is successfull and has deployment' do
+      context 'job is successfull and has deployment' do
         let(:deployment) { create(:deployment) }
         let(:build) { create(:ci_build, :success, environment: environment.name, deployments: [deployment], pipeline: pipeline) }
 
-        it 'shows a link for the build' do
+        it 'shows a link for the job' do
           visit namespace_project_build_path(project.namespace, project, build)
 
           expect(page).to have_link environment.name
         end
       end
 
-      context 'build is complete and not successfull' do
+      context 'job is complete and not successfull' do
         let(:build) { create(:ci_build, :failed, environment: environment.name, pipeline: pipeline) }
 
-        it 'shows a link for the build' do
+        it 'shows a link for the job' do
           visit namespace_project_build_path(project.namespace, project, build)
 
           expect(page).to have_link environment.name
         end
       end
 
-      context 'build creates a new deployment' do
+      context 'job creates a new deployment' do
         let!(:deployment) { create(:deployment, environment: environment, sha: project.commit.id) }
         let(:build) { create(:ci_build, :success, environment: environment.name, pipeline: pipeline) }
 
@@ -281,7 +281,7 @@ feature 'Builds', :feature do
   end
 
   describe "POST /:project/builds/:id/cancel" do
-    context "Build from project" do
+    context "Job from project" do
       before do
         build.run!
         visit namespace_project_build_path(project.namespace, project, build)
@@ -295,7 +295,7 @@ feature 'Builds', :feature do
       end
     end
 
-    context "Build from other project" do
+    context "Job from other project" do
       before do
         build.run!
         visit namespace_project_build_path(project.namespace, project, build)
@@ -307,13 +307,13 @@ feature 'Builds', :feature do
   end
 
   describe "POST /:project/builds/:id/retry" do
-    context "Build from project" do
+    context "Job from project" do
       before do
         build.run!
         visit namespace_project_build_path(project.namespace, project, build)
         click_link 'Cancel'
         page.within('.build-header') do
-          click_link 'Retry build'
+          click_link 'Retry job'
         end
       end
 
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index fe047e00409..36a80d7575d 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -7,7 +7,7 @@ feature 'User wants to edit a file', feature: true do
   let(:user) { create(:user) }
   let(:commit_params) do
     {
-      source_branch: project.default_branch,
+      start_branch: project.default_branch,
       target_branch: project.default_branch,
       commit_message: "Committing First Update",
       file_path: ".gitignore",
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
index a521ce50f35..64094af29c0 100644
--- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -6,7 +6,8 @@ feature 'project owner creates a license file', feature: true, js: true do
   let(:project_master) { create(:user) }
   let(:project) { create(:project) }
   background do
-    project.repository.remove_file(project_master, 'LICENSE', 'Remove LICENSE', 'master')
+    project.repository.remove_file(project_master, 'LICENSE',
+      message: 'Remove LICENSE', branch_name: 'master')
     project.team << [project_master, :master]
     login_as(project_master)
     visit namespace_project_path(project.namespace, project)
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 6dae5c64b30..e90a033b8c4 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -18,8 +18,20 @@ feature 'issuable templates', feature: true, js: true do
     let(:description_addition) { ' appending to description' }
 
     background do
-      project.repository.commit_file(user, '.gitlab/issue_templates/bug.md', template_content, 'added issue template', 'master', false)
-      project.repository.commit_file(user, '.gitlab/issue_templates/test.md', longtemplate_content, 'added issue template', 'master', false)
+      project.repository.commit_file(
+        user,
+        '.gitlab/issue_templates/bug.md',
+        template_content,
+        message: 'added issue template',
+        branch_name: 'master',
+        update: false)
+      project.repository.commit_file(
+        user,
+        '.gitlab/issue_templates/test.md',
+        longtemplate_content,
+        message: 'added issue template',
+        branch_name: 'master',
+        update: false)
       visit edit_namespace_project_issue_path project.namespace, project, issue
       fill_in :'issue[title]', with: 'test issue title'
     end
@@ -67,7 +79,13 @@ feature 'issuable templates', feature: true, js: true do
     let(:issue) { create(:issue, author: user, assignee: user, project: project) }
 
     background do
-      project.repository.commit_file(user, '.gitlab/issue_templates/bug.md', template_content, 'added issue template', 'master', false)
+      project.repository.commit_file(
+        user,
+        '.gitlab/issue_templates/bug.md',
+        template_content,
+        message: 'added issue template',
+        branch_name: 'master',
+        update: false)
       visit edit_namespace_project_issue_path project.namespace, project, issue
       fill_in :'issue[title]', with: 'test issue title'
       fill_in :'issue[description]', with: prior_description
@@ -86,7 +104,13 @@ feature 'issuable templates', feature: true, js: true do
     let(:merge_request) { create(:merge_request, :with_diffs, source_project: project) }
 
     background do
-      project.repository.commit_file(user, '.gitlab/merge_request_templates/feature-proposal.md', template_content, 'added merge request template', 'master', false)
+      project.repository.commit_file(
+        user,
+        '.gitlab/merge_request_templates/feature-proposal.md',
+        template_content,
+        message: 'added merge request template',
+        branch_name: 'master',
+        update: false)
       visit edit_namespace_project_merge_request_path project.namespace, project, merge_request
       fill_in :'merge_request[title]', with: 'test merge request title'
     end
@@ -111,7 +135,13 @@ feature 'issuable templates', feature: true, js: true do
       fork_project.team << [fork_user, :master]
       create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project)
       login_as fork_user
-      project.repository.commit_file(fork_user, '.gitlab/merge_request_templates/feature-proposal.md', template_content, 'added merge request template', 'master', false)
+      project.repository.commit_file(
+        fork_user,
+        '.gitlab/merge_request_templates/feature-proposal.md',
+        template_content,
+        message: 'added merge request template',
+        branch_name: 'master',
+        update: false)
       visit edit_namespace_project_merge_request_path project.namespace, project, merge_request
       fill_in :'merge_request[title]', with: 'test merge request title'
     end
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 917b545e98b..0b5ccc8c515 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -91,10 +91,10 @@ describe 'Pipeline', :feature, :js do
           end
         end
 
-        it 'should be possible to retry the success build' do
+        it 'should be possible to retry the success job' do
           find('#ci-badge-build .ci-action-icon-container').trigger('click')
 
-          expect(page).not_to have_content('Retry build')
+          expect(page).not_to have_content('Retry job')
         end
       end
 
@@ -113,11 +113,11 @@ describe 'Pipeline', :feature, :js do
         it 'should be possible to retry the failed build' do
           find('#ci-badge-test .ci-action-icon-container').trigger('click')
 
-          expect(page).not_to have_content('Retry build')
+          expect(page).not_to have_content('Retry job')
         end
       end
 
-      context 'when pipeline has manual builds' do
+      context 'when pipeline has manual jobs' do
         it 'shows the skipped icon and a play action for the manual build' do
           page.within('#ci-badge-manual-build') do
             expect(page).to have_selector('.js-ci-status-icon-manual')
@@ -129,14 +129,14 @@ describe 'Pipeline', :feature, :js do
           end
         end
 
-        it 'should be possible to play the manual build' do
+        it 'should be possible to play the manual job' do
           find('#ci-badge-manual-build .ci-action-icon-container').trigger('click')
 
-          expect(page).not_to have_content('Play build')
+          expect(page).not_to have_content('Play job')
         end
       end
 
-      context 'when pipeline has external build' do
+      context 'when pipeline has external job' do
         it 'shows the success icon and the generic comit status build' do
           expect(page).to have_selector('.js-ci-status-icon-success')
           expect(page).to have_content('jenkins')
@@ -146,12 +146,12 @@ describe 'Pipeline', :feature, :js do
     end
 
     context 'page tabs' do
-      it 'shows Pipeline and Builds tabs with link' do
+      it 'shows Pipeline and Jobs tabs with link' do
         expect(page).to have_link('Pipeline')
-        expect(page).to have_link('Builds')
+        expect(page).to have_link('Jobs')
       end
 
-      it 'shows counter in Builds tab' do
+      it 'shows counter in Jobs tab' do
         expect(page.find('.js-builds-counter').text).to eq(pipeline.statuses.count.to_s)
       end
 
@@ -160,7 +160,7 @@ describe 'Pipeline', :feature, :js do
       end
     end
 
-    context 'retrying builds' do
+    context 'retrying jobs' do
       it { expect(page).not_to have_content('retried') }
 
       context 'when retrying' do
@@ -170,7 +170,7 @@ describe 'Pipeline', :feature, :js do
       end
     end
 
-    context 'canceling builds' do
+    context 'canceling jobs' do
       it { expect(page).not_to have_selector('.ci-canceled') }
 
       context 'when canceling' do
@@ -191,7 +191,7 @@ describe 'Pipeline', :feature, :js do
       visit builds_namespace_project_pipeline_path(project.namespace, project, pipeline)
     end
 
-    it 'shows a list of builds' do
+    it 'shows a list of jobs' do
       expect(page).to have_content('Test')
       expect(page).to have_content(build_passed.id)
       expect(page).to have_content('Deploy')
@@ -203,26 +203,26 @@ describe 'Pipeline', :feature, :js do
       expect(page).to have_link('Play')
     end
 
-    it 'shows Builds tab pane as active' do
+    it 'shows jobs tab pane as active' do
       expect(page).to have_css('#js-tab-builds.active')
     end
 
     context 'page tabs' do
-      it 'shows Pipeline and Builds tabs with link' do
+      it 'shows Pipeline and Jobs tabs with link' do
         expect(page).to have_link('Pipeline')
-        expect(page).to have_link('Builds')
+        expect(page).to have_link('Jobs')
       end
 
-      it 'shows counter in Builds tab' do
+      it 'shows counter in Jobs tab' do
         expect(page.find('.js-builds-counter').text).to eq(pipeline.statuses.count.to_s)
       end
 
-      it 'shows Builds tab as active' do
+      it 'shows Jobs tab as active' do
         expect(page).to have_css('li.js-builds-tab-link.active')
       end
     end
 
-    context 'retrying builds' do
+    context 'retrying jobs' do
       it { expect(page).not_to have_content('retried') }
 
       context 'when retrying' do
@@ -233,7 +233,7 @@ describe 'Pipeline', :feature, :js do
       end
     end
 
-    context 'canceling builds' do
+    context 'canceling jobs' do
       it { expect(page).not_to have_selector('.ci-canceled') }
 
       context 'when canceling' do
@@ -244,7 +244,7 @@ describe 'Pipeline', :feature, :js do
       end
     end
 
-    context 'playing manual build' do
+    context 'playing manual job' do
       before do
         within '.pipeline-holder' do
           click_link('Play')
diff --git a/spec/features/projects/ref_switcher_spec.rb b/spec/features/projects/ref_switcher_spec.rb
index 472491188c9..38fe2d92885 100644
--- a/spec/features/projects/ref_switcher_spec.rb
+++ b/spec/features/projects/ref_switcher_spec.rb
@@ -17,14 +17,15 @@ feature 'Ref switcher', feature: true, js: true do
 
     page.within '.project-refs-form' do
       input = find('input[type="search"]')
-      input.set 'expand'
+      input.set 'binary'
+      wait_for_ajax
 
       input.native.send_keys :down
       input.native.send_keys :down
       input.native.send_keys :enter
     end
 
-    expect(page).to have_title 'expand-collapse-files'
+    expect(page).to have_title 'binary-encoding'
   end
 
   it "user selects ref with special characters" do
diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb
index 4bfaa499272..034b75c2e51 100644
--- a/spec/features/projects/settings/merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/merge_requests_settings_spec.rb
@@ -11,41 +11,41 @@ feature 'Project settings > Merge Requests', feature: true, js: true do
     login_as(user)
   end
 
-  context 'when Merge Request and Builds are initially enabled' do
+  context 'when Merge Request and Pipelines are initially enabled' do
     before do
       project.project_feature.update_attribute('merge_requests_access_level', ProjectFeature::ENABLED)
     end
 
-    context 'when Builds are initially enabled' do
+    context 'when Pipelines are initially enabled' do
       before do
         project.project_feature.update_attribute('builds_access_level', ProjectFeature::ENABLED)
         visit edit_project_path(project)
       end
 
       scenario 'shows the Merge Requests settings' do
-        expect(page).to have_content('Only allow merge requests to be merged if the build succeeds')
+        expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds')
         expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved')
 
         select 'Disabled', from: "project_project_feature_attributes_merge_requests_access_level"
 
-        expect(page).not_to have_content('Only allow merge requests to be merged if the build succeeds')
+        expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds')
         expect(page).not_to have_content('Only allow merge requests to be merged if all discussions are resolved')
       end
     end
 
-    context 'when Builds are initially disabled' do
+    context 'when Pipelines are initially disabled' do
       before do
         project.project_feature.update_attribute('builds_access_level', ProjectFeature::DISABLED)
         visit edit_project_path(project)
       end
 
       scenario 'shows the Merge Requests settings that do not depend on Builds feature' do
-        expect(page).not_to have_content('Only allow merge requests to be merged if the build succeeds')
+        expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds')
         expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved')
 
         select 'Everyone with access', from: "project_project_feature_attributes_builds_access_level"
 
-        expect(page).to have_content('Only allow merge requests to be merged if the build succeeds')
+        expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds')
         expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved')
       end
     end
@@ -58,12 +58,12 @@ feature 'Project settings > Merge Requests', feature: true, js: true do
     end
 
     scenario 'does not show the Merge Requests settings' do
-      expect(page).not_to have_content('Only allow merge requests to be merged if the build succeeds')
+      expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds')
       expect(page).not_to have_content('Only allow merge requests to be merged if all discussions are resolved')
 
       select 'Everyone with access', from: "project_project_feature_attributes_merge_requests_access_level"
 
-      expect(page).to have_content('Only allow merge requests to be merged if the build succeeds')
+      expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds')
       expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved')
     end
   end
diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json
index 77f2bcee1f3..8e19cee5440 100644
--- a/spec/fixtures/api/schemas/issue.json
+++ b/spec/fixtures/api/schemas/issue.json
@@ -6,6 +6,7 @@
     "confidential"
   ],
   "properties" : {
+    "id": { "type": "integer" },
     "iid": { "type": "integer" },
     "title": { "type": "string" },
     "confidential": { "type": "boolean" },
diff --git a/spec/fixtures/api/schemas/list.json b/spec/fixtures/api/schemas/list.json
index 8d94cf26ecb..819287bf919 100644
--- a/spec/fixtures/api/schemas/list.json
+++ b/spec/fixtures/api/schemas/list.json
@@ -10,7 +10,7 @@
     "id": { "type": "integer" },
     "list_type": {
       "type": "string",
-      "enum": ["backlog", "label", "done"]
+      "enum": ["label", "done"]
     },
     "label": {
       "type": ["object", "null"],
diff --git a/spec/javascripts/behaviors/autosize_spec.js b/spec/javascripts/behaviors/autosize_spec.js
index ac1fb098251..4a3da9e318b 100644
--- a/spec/javascripts/behaviors/autosize_spec.js
+++ b/spec/javascripts/behaviors/autosize_spec.js
@@ -15,7 +15,7 @@ require('~/behaviors/autosize');
       });
     });
     return load = function() {
-      return $(document).trigger('page:load');
+      return $(document).trigger('load');
     };
   });
 }).call(this);
diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/javascripts/behaviors/requires_input_spec.js
index 3fa5c65c0a6..a958ac76e66 100644
--- a/spec/javascripts/behaviors/requires_input_spec.js
+++ b/spec/javascripts/behaviors/requires_input_spec.js
@@ -34,11 +34,5 @@ require('~/behaviors/requires_input');
       $('#required5').val('1').change();
       return expect($('.submit')).not.toBeDisabled();
     });
-    return it('is called on page:load event', function() {
-      var spy;
-      spy = spyOn($.fn, 'requiresInput');
-      $(document).trigger('page:load');
-      return expect(spy).toHaveBeenCalled();
-    });
   });
 }).call(this);
diff --git a/spec/javascripts/boards/boards_store_spec.js.es6 b/spec/javascripts/boards/boards_store_spec.js.es6
index 4f1d8968521..9dd741a680b 100644
--- a/spec/javascripts/boards/boards_store_spec.js.es6
+++ b/spec/javascripts/boards/boards_store_spec.js.es6
@@ -18,7 +18,7 @@ require('./mock_data');
 describe('Store', () => {
   beforeEach(() => {
     Vue.http.interceptors.push(boardsMockInterceptor);
-    gl.boardService = new BoardService('/test/issue-boards/board', '1');
+    gl.boardService = new BoardService('/test/issue-boards/board', '', '1');
     gl.issueBoards.BoardsStore.create();
 
     Cookies.set('issue_board_welcome_hidden', 'false', {
@@ -56,18 +56,6 @@ describe('Store', () => {
       expect(list).toBeDefined();
     });
 
-    it('finds list limited by type', () => {
-      gl.issueBoards.BoardsStore.addList({
-        id: 1,
-        position: 0,
-        title: 'Test',
-        list_type: 'backlog'
-      });
-      const list = gl.issueBoards.BoardsStore.findList('id', 1, 'backlog');
-
-      expect(list).toBeDefined();
-    });
-
     it('gets issue when new list added', (done) => {
       gl.issueBoards.BoardsStore.addList(listObj);
       const list = gl.issueBoards.BoardsStore.findList('id', 1);
@@ -112,10 +100,7 @@ describe('Store', () => {
       expect(gl.issueBoards.BoardsStore.shouldAddBlankState()).toBe(false);
     });
 
-    it('check for blank state adding when backlog & done list exist', () => {
-      gl.issueBoards.BoardsStore.addList({
-        list_type: 'backlog'
-      });
+    it('check for blank state adding when done list exist', () => {
       gl.issueBoards.BoardsStore.addList({
         list_type: 'done'
       });
diff --git a/spec/javascripts/boards/issue_card_spec.js.es6 b/spec/javascripts/boards/issue_card_spec.js.es6
new file mode 100644
index 00000000000..4340a571017
--- /dev/null
+++ b/spec/javascripts/boards/issue_card_spec.js.es6
@@ -0,0 +1,191 @@
+/* global Vue */
+/* global ListUser */
+/* global ListLabel */
+/* global listObj */
+/* global ListIssue */
+
+require('~/boards/models/issue');
+require('~/boards/models/label');
+require('~/boards/models/list');
+require('~/boards/models/user');
+require('~/boards/stores/boards_store');
+require('~/boards/components/issue_card_inner');
+require('./mock_data');
+
+describe('Issue card component', () => {
+  const user = new ListUser({
+    id: 1,
+    name: 'testing 123',
+    username: 'test',
+    avatar: 'test_image',
+  });
+  const label1 = new ListLabel({
+    id: 3,
+    title: 'testing 123',
+    color: 'blue',
+    text_color: 'white',
+    description: 'test',
+  });
+  let component;
+  let issue;
+  let list;
+
+  beforeEach(() => {
+    setFixtures('<div class="test-container"></div>');
+
+    list = listObj;
+    issue = new ListIssue({
+      title: 'Testing',
+      iid: 1,
+      confidential: false,
+      labels: [list.label],
+    });
+
+    component = new Vue({
+      el: document.querySelector('.test-container'),
+      data() {
+        return {
+          list,
+          issue,
+          issueLinkBase: '/test',
+          rootPath: '/',
+        };
+      },
+      components: {
+        'issue-card': gl.issueBoards.IssueCardInner,
+      },
+      template: `
+        <issue-card
+          :issue="issue"
+          :list="list"
+          :issue-link-base="issueLinkBase"
+          :root-path="rootPath"></issue-card>
+      `,
+    });
+  });
+
+  it('renders issue title', () => {
+    expect(
+      component.$el.querySelector('.card-title').textContent,
+    ).toContain(issue.title);
+  });
+
+  it('includes issue base in link', () => {
+    expect(
+      component.$el.querySelector('.card-title a').getAttribute('href'),
+    ).toContain('/test');
+  });
+
+  it('includes issue title on link', () => {
+    expect(
+      component.$el.querySelector('.card-title a').getAttribute('title'),
+    ).toBe(issue.title);
+  });
+
+  it('does not render confidential icon', () => {
+    expect(
+      component.$el.querySelector('.fa-eye-flash'),
+    ).toBeNull();
+  });
+
+  it('renders confidential icon', (done) => {
+    component.issue.confidential = true;
+
+    setTimeout(() => {
+      expect(
+        component.$el.querySelector('.confidential-icon'),
+      ).not.toBeNull();
+      done();
+    }, 0);
+  });
+
+  it('renders issue ID with #', () => {
+    expect(
+      component.$el.querySelector('.card-number').textContent,
+    ).toContain(`#${issue.id}`);
+  });
+
+  describe('assignee', () => {
+    it('does not render assignee', () => {
+      expect(
+        component.$el.querySelector('.card-assignee'),
+      ).toBeNull();
+    });
+
+    describe('exists', () => {
+      beforeEach((done) => {
+        component.issue.assignee = user;
+
+        setTimeout(() => {
+          done();
+        }, 0);
+      });
+
+      it('renders assignee', () => {
+        expect(
+          component.$el.querySelector('.card-assignee'),
+        ).not.toBeNull();
+      });
+
+      it('sets title', () => {
+        expect(
+          component.$el.querySelector('.card-assignee').getAttribute('title'),
+        ).toContain(`Assigned to ${user.name}`);
+      });
+
+      it('sets users path', () => {
+        expect(
+          component.$el.querySelector('.card-assignee').getAttribute('href'),
+        ).toBe('/test');
+      });
+
+      it('renders avatar', () => {
+        expect(
+          component.$el.querySelector('.card-assignee img'),
+        ).not.toBeNull();
+      });
+    });
+  });
+
+  describe('labels', () => {
+    it('does not render any', () => {
+      expect(
+        component.$el.querySelector('.label'),
+      ).toBeNull();
+    });
+
+    describe('exists', () => {
+      beforeEach((done) => {
+        component.issue.addLabel(label1);
+
+        setTimeout(() => {
+          done();
+        }, 0);
+      });
+
+      it('does not render list label', () => {
+        expect(
+          component.$el.querySelectorAll('.label').length,
+        ).toBe(1);
+      });
+
+      it('renders label', () => {
+        expect(
+          component.$el.querySelector('.label').textContent,
+        ).toContain(label1.title);
+      });
+
+      it('sets label description as title', () => {
+        expect(
+          component.$el.querySelector('.label').getAttribute('title'),
+        ).toContain(label1.description);
+      });
+
+      it('sets background color of button', () => {
+        expect(
+          component.$el.querySelector('.label').style.backgroundColor,
+        ).toContain(label1.color);
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/boards/issue_spec.js.es6 b/spec/javascripts/boards/issue_spec.js.es6
index 5514f34c828..aab4d9c501e 100644
--- a/spec/javascripts/boards/issue_spec.js.es6
+++ b/spec/javascripts/boards/issue_spec.js.es6
@@ -15,7 +15,7 @@ describe('Issue model', () => {
   let issue;
 
   beforeEach(() => {
-    gl.boardService = new BoardService('/test/issue-boards/board', '1');
+    gl.boardService = new BoardService('/test/issue-boards/board', '', '1');
     gl.issueBoards.BoardsStore.create();
 
     issue = new ListIssue({
diff --git a/spec/javascripts/boards/list_spec.js.es6 b/spec/javascripts/boards/list_spec.js.es6
index 31b49e3e27a..4397a32fedc 100644
--- a/spec/javascripts/boards/list_spec.js.es6
+++ b/spec/javascripts/boards/list_spec.js.es6
@@ -19,7 +19,7 @@ describe('List model', () => {
 
   beforeEach(() => {
     Vue.http.interceptors.push(boardsMockInterceptor);
-    gl.boardService = new BoardService('/test/issue-boards/board', '1');
+    gl.boardService = new BoardService('/test/issue-boards/board', '', '1');
     gl.issueBoards.BoardsStore.create();
 
     list = new List(listObj);
diff --git a/spec/javascripts/boards/modal_store_spec.js.es6 b/spec/javascripts/boards/modal_store_spec.js.es6
new file mode 100644
index 00000000000..1815847f3fa
--- /dev/null
+++ b/spec/javascripts/boards/modal_store_spec.js.es6
@@ -0,0 +1,132 @@
+/* global Vue */
+/* global ListIssue */
+
+require('~/boards/models/issue');
+require('~/boards/models/label');
+require('~/boards/models/list');
+require('~/boards/models/user');
+require('~/boards/stores/modal_store');
+
+describe('Modal store', () => {
+  let issue;
+  let issue2;
+  const Store = gl.issueBoards.ModalStore;
+
+  beforeEach(() => {
+    // Setup default state
+    Store.store.issues = [];
+    Store.store.selectedIssues = [];
+
+    issue = new ListIssue({
+      title: 'Testing',
+      iid: 1,
+      confidential: false,
+      labels: [],
+    });
+    issue2 = new ListIssue({
+      title: 'Testing',
+      iid: 2,
+      confidential: false,
+      labels: [],
+    });
+    Store.store.issues.push(issue);
+    Store.store.issues.push(issue2);
+  });
+
+  it('returns selected count', () => {
+    expect(Store.selectedCount()).toBe(0);
+  });
+
+  it('toggles the issue as selected', () => {
+    Store.toggleIssue(issue);
+
+    expect(issue.selected).toBe(true);
+    expect(Store.selectedCount()).toBe(1);
+  });
+
+  it('toggles the issue as un-selected', () => {
+    Store.toggleIssue(issue);
+    Store.toggleIssue(issue);
+
+    expect(issue.selected).toBe(false);
+    expect(Store.selectedCount()).toBe(0);
+  });
+
+  it('toggles all issues as selected', () => {
+    Store.toggleAll();
+
+    expect(issue.selected).toBe(true);
+    expect(issue2.selected).toBe(true);
+    expect(Store.selectedCount()).toBe(2);
+  });
+
+  it('toggles all issues as un-selected', () => {
+    Store.toggleAll();
+    Store.toggleAll();
+
+    expect(issue.selected).toBe(false);
+    expect(issue2.selected).toBe(false);
+    expect(Store.selectedCount()).toBe(0);
+  });
+
+  it('toggles all if a single issue is selected', () => {
+    Store.toggleIssue(issue);
+    Store.toggleAll();
+
+    expect(issue.selected).toBe(true);
+    expect(issue2.selected).toBe(true);
+    expect(Store.selectedCount()).toBe(2);
+  });
+
+  it('adds issue to selected array', () => {
+    issue.selected = true;
+    Store.addSelectedIssue(issue);
+
+    expect(Store.selectedCount()).toBe(1);
+  });
+
+  it('removes issue from selected array', () => {
+    Store.addSelectedIssue(issue);
+    Store.removeSelectedIssue(issue);
+
+    expect(Store.selectedCount()).toBe(0);
+  });
+
+  it('returns selected issue index if present', () => {
+    Store.toggleIssue(issue);
+
+    expect(Store.selectedIssueIndex(issue)).toBe(0);
+  });
+
+  it('returns -1 if issue is not selected', () => {
+    expect(Store.selectedIssueIndex(issue)).toBe(-1);
+  });
+
+  it('finds the selected issue', () => {
+    Store.toggleIssue(issue);
+
+    expect(Store.findSelectedIssue(issue)).toBe(issue);
+  });
+
+  it('does not find a selected issue', () => {
+    expect(Store.findSelectedIssue(issue)).toBe(undefined);
+  });
+
+  it('does not remove from selected issue if tab is not all', () => {
+    Store.store.activeTab = 'selected';
+
+    Store.toggleIssue(issue);
+    Store.toggleIssue(issue);
+
+    expect(Store.store.selectedIssues.length).toBe(1);
+    expect(Store.selectedCount()).toBe(0);
+  });
+
+  it('gets selected issue array with only selected issues', () => {
+    Store.toggleIssue(issue);
+    Store.toggleIssue(issue2);
+    Store.toggleIssue(issue2);
+
+    expect(Store.getSelectedIssues().length).toBe(1);
+  });
+});
diff --git a/spec/javascripts/bootstrap_linked_tabs_spec.js.es6 b/spec/javascripts/bootstrap_linked_tabs_spec.js.es6
index 9f6db2b0723..fa9f95e16cd 100644
--- a/spec/javascripts/bootstrap_linked_tabs_spec.js.es6
+++ b/spec/javascripts/bootstrap_linked_tabs_spec.js.es6
@@ -62,7 +62,6 @@ require('~/lib/utils/bootstrap_linked_tabs');
 
         if (historySpy) {
           expect(historySpy).toHaveBeenCalledWith({
-            turbolinks: true,
             url: newState,
           }, document.title, newState);
         }
diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index d2a093df146..0bd50588f5a 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -1,8 +1,8 @@
 /* eslint-disable no-new */
 /* global Build */
-/* global Turbolinks */
 
 require('~/lib/utils/datetime_utility');
+require('~/lib/utils/url_utility');
 require('~/build');
 require('~/breakpoints');
 require('vendor/jquery.nicescroll');
@@ -166,7 +166,7 @@ describe('Build', () => {
       });
 
       it('reloads the page when the build is done', () => {
-        spyOn(Turbolinks, 'visit');
+        spyOn(gl.utils, 'visitUrl');
 
         jasmine.clock().tick(4001);
         const [{ success, context }] = $.ajax.calls.argsFor(1);
@@ -176,7 +176,7 @@ describe('Build', () => {
           append: true,
         });
 
-        expect(Turbolinks.visit).toHaveBeenCalledWith(BUILD_URL);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith(BUILD_URL);
       });
     });
   });
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
index ab6d2010d65..98959dda242 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
@@ -1,5 +1,4 @@
-/* global Turbolinks */
-
+require('~/lib/utils/url_utility');
 require('~/lib/utils/common_utils');
 require('~/filtered_search/filtered_search_token_keys');
 require('~/filtered_search/filtered_search_tokenizer');
@@ -37,7 +36,7 @@ require('~/filtered_search/filtered_search_manager');
       it('should search with a single word', () => {
         getInput().value = 'searchTerm';
 
-        spyOn(Turbolinks, 'visit').and.callFake((url) => {
+        spyOn(gl.utils, 'visitUrl').and.callFake((url) => {
           expect(url).toEqual(`${defaultParams}&search=searchTerm`);
         });
 
@@ -47,7 +46,7 @@ require('~/filtered_search/filtered_search_manager');
       it('should search with multiple words', () => {
         getInput().value = 'awesome search terms';
 
-        spyOn(Turbolinks, 'visit').and.callFake((url) => {
+        spyOn(gl.utils, 'visitUrl').and.callFake((url) => {
           expect(url).toEqual(`${defaultParams}&search=awesome+search+terms`);
         });
 
@@ -57,7 +56,7 @@ require('~/filtered_search/filtered_search_manager');
       it('should search with special characters', () => {
         getInput().value = '~!@#$%^&*()_+{}:<>,.?/';
 
-        spyOn(Turbolinks, 'visit').and.callFake((url) => {
+        spyOn(gl.utils, 'visitUrl').and.callFake((url) => {
           expect(url).toEqual(`${defaultParams}&search=~!%40%23%24%25%5E%26*()_%2B%7B%7D%3A%3C%3E%2C.%3F%2F`);
         });
 
diff --git a/spec/javascripts/fixtures/environments/table.html.haml b/spec/javascripts/fixtures/environments/table.html.haml
index 1ea1725c561..59edc0396d2 100644
--- a/spec/javascripts/fixtures/environments/table.html.haml
+++ b/spec/javascripts/fixtures/environments/table.html.haml
@@ -3,7 +3,7 @@
     %tr
       %th Environment
       %th Last deployment
-      %th Build
+      %th Job
       %th Commit
       %th
       %th
diff --git a/spec/javascripts/gl_dropdown_spec.js.es6 b/spec/javascripts/gl_dropdown_spec.js.es6
index a3b81b663e0..317f38c5888 100644
--- a/spec/javascripts/gl_dropdown_spec.js.es6
+++ b/spec/javascripts/gl_dropdown_spec.js.es6
@@ -1,9 +1,9 @@
 /* eslint-disable comma-dangle, no-param-reassign, no-unused-expressions, max-len */
-/* global Turbolinks */
 
 require('~/gl_dropdown');
 require('~/lib/utils/common_utils');
 require('~/lib/utils/type_utility');
+require('~/lib/utils/url_utility');
 
 (() => {
   const NON_SELECTABLE_CLASSES = '.divider, .separator, .dropdown-header, .dropdown-menu-empty-link';
@@ -111,13 +111,13 @@ require('~/lib/utils/type_utility');
         expect(this.dropdownContainerElement).toHaveClass('open');
         const randomIndex = Math.floor(Math.random() * (this.projectsData.length - 1)) + 0;
         navigateWithKeys('down', randomIndex, () => {
-          spyOn(Turbolinks, 'visit').and.stub();
+          spyOn(gl.utils, 'visitUrl').and.stub();
           navigateWithKeys('enter', null, () => {
             expect(this.dropdownContainerElement).not.toHaveClass('open');
             const link = $(`${ITEM_SELECTOR}:eq(${randomIndex}) a`, this.$dropdownMenuElement);
             expect(link).toHaveClass('is-active');
             const linkedLocation = link.attr('href');
-            if (linkedLocation && linkedLocation !== '#') expect(Turbolinks.visit).toHaveBeenCalledWith(linkedLocation);
+            if (linkedLocation && linkedLocation !== '#') expect(gl.utils.visitUrl).toHaveBeenCalledWith(linkedLocation);
           });
         });
       });
diff --git a/spec/javascripts/issuable_spec.js.es6 b/spec/javascripts/issuable_spec.js.es6
index d846c242b1e..26d87cc5931 100644
--- a/spec/javascripts/issuable_spec.js.es6
+++ b/spec/javascripts/issuable_spec.js.es6
@@ -1,6 +1,6 @@
 /* global Issuable */
-/* global Turbolinks */
 
+require('~/lib/utils/url_utility');
 require('~/issuable');
 
 (() => {
@@ -41,39 +41,39 @@ require('~/issuable');
       });
 
       it('should contain only the default parameters', () => {
-        spyOn(Turbolinks, 'visit');
+        spyOn(gl.utils, 'visitUrl');
 
         Issuable.filterResults($filtersForm);
 
-        expect(Turbolinks.visit).toHaveBeenCalledWith(BASE_URL + DEFAULT_PARAMS);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith(BASE_URL + DEFAULT_PARAMS);
       });
 
       it('should filter for the phrase "broken"', () => {
-        spyOn(Turbolinks, 'visit');
+        spyOn(gl.utils, 'visitUrl');
 
         updateForm({ search: 'broken' }, $filtersForm);
         Issuable.filterResults($filtersForm);
         const params = `${DEFAULT_PARAMS}&search=broken`;
 
-        expect(Turbolinks.visit).toHaveBeenCalledWith(BASE_URL + params);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith(BASE_URL + params);
       });
 
       it('should keep query parameters after modifying filter', () => {
-        spyOn(Turbolinks, 'visit');
+        spyOn(gl.utils, 'visitUrl');
 
         // initial filter
         updateForm({ milestone_title: 'v1.0' }, $filtersForm);
 
         Issuable.filterResults($filtersForm);
         let params = `${DEFAULT_PARAMS}&milestone_title=v1.0`;
-        expect(Turbolinks.visit).toHaveBeenCalledWith(BASE_URL + params);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith(BASE_URL + params);
 
         // update filter
         updateForm({ label_name: 'Frontend' }, $filtersForm);
 
         Issuable.filterResults($filtersForm);
         params = `${DEFAULT_PARAMS}&milestone_title=v1.0&label_name=Frontend`;
-        expect(Turbolinks.visit).toHaveBeenCalledWith(BASE_URL + params);
+        expect(gl.utils.visitUrl).toHaveBeenCalledWith(BASE_URL + params);
       });
     });
   });
diff --git a/spec/javascripts/lib/utils/text_utility_spec.js.es6 b/spec/javascripts/lib/utils/text_utility_spec.js.es6
index 976e24c4ea5..86ade66ec29 100644
--- a/spec/javascripts/lib/utils/text_utility_spec.js.es6
+++ b/spec/javascripts/lib/utils/text_utility_spec.js.es6
@@ -21,5 +21,19 @@ require('~/lib/utils/text_utility');
         expect(largeFont > regular).toBe(true);
       });
     });
+
+    describe('gl.text.pluralize', () => {
+      it('returns pluralized', () => {
+        expect(gl.text.pluralize('test', 2)).toBe('tests');
+      });
+
+      it('returns pluralized when count is 0', () => {
+        expect(gl.text.pluralize('test', 0)).toBe('tests');
+      });
+
+      it('does not return pluralized', () => {
+        expect(gl.text.pluralize('test', 1)).toBe('test');
+      });
+    });
   });
 })();
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
index 5b52b0036a9..d20a59df041 100644
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
@@ -111,7 +111,6 @@ require('vendor/jquery.scrollTo');
         newState = this.subject('commits');
         if (!phantomjs) {
           expect(this.spies.history).toHaveBeenCalledWith({
-            turbolinks: true,
             url: newState
           }, document.title, newState);
         }
diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/javascripts/search_autocomplete_spec.js
index 05f96ef5802..c79e30e9481 100644
--- a/spec/javascripts/search_autocomplete_spec.js
+++ b/spec/javascripts/search_autocomplete_spec.js
@@ -116,7 +116,7 @@ require('vendor/fuzzaldrin-plus');
       loadFixtures('static/search_autocomplete.html.raw');
       widget = new gl.SearchAutocomplete;
       // Prevent turbolinks from triggering within gl_dropdown
-      spyOn(window.Turbolinks, 'visit').and.returnValue(true);
+      spyOn(window.gl.utils, 'visitUrl').and.returnValue(true);
     });
     it('should show Dashboard specific dropdown menu', function() {
       var list;
diff --git a/spec/javascripts/smart_interval_spec.js.es6 b/spec/javascripts/smart_interval_spec.js.es6
index 0c8051810cc..4366ec2a5b8 100644
--- a/spec/javascripts/smart_interval_spec.js.es6
+++ b/spec/javascripts/smart_interval_spec.js.es6
@@ -163,7 +163,7 @@ require('~/smart_interval');
         const interval = this.smartInterval;
 
         setTimeout(() => {
-          $(document).trigger('page:before-unload');
+          $(document).triggerHandler('beforeunload');
           expect(interval.state.intervalId).toBeUndefined();
           expect(interval.getCurrentInterval()).toBe(interval.cfg.startingInterval);
           done();
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index cbe8abbbc08..bf11ddbbea8 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -11,8 +11,6 @@ window.Cookies = require('vendor/js.cookie');
 window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
 require('jquery-ujs');
-require('vendor/turbolinks');
-require('vendor/jquery.turbolinks');
 require('bootstrap/js/affix');
 require('bootstrap/js/alert');
 require('bootstrap/js/button');
diff --git a/spec/lib/banzai/cross_project_reference_spec.rb b/spec/lib/banzai/cross_project_reference_spec.rb
index 81b9a513ce3..deaabceef1c 100644
--- a/spec/lib/banzai/cross_project_reference_spec.rb
+++ b/spec/lib/banzai/cross_project_reference_spec.rb
@@ -24,7 +24,7 @@ describe Banzai::CrossProjectReference, lib: true do
       it 'returns the referenced project' do
         project2 = double('referenced project')
 
-        expect(Project).to receive(:find_with_namespace).
+        expect(Project).to receive(:find_by_full_path).
           with('cross/reference').and_return(project2)
 
         expect(project_from_ref('cross/reference')).to eq project2
diff --git a/spec/lib/banzai/filter/plantuml_filter_spec.rb b/spec/lib/banzai/filter/plantuml_filter_spec.rb
new file mode 100644
index 00000000000..f85a5dcbd8b
--- /dev/null
+++ b/spec/lib/banzai/filter/plantuml_filter_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Banzai::Filter::PlantumlFilter, lib: true do
+  include FilterSpecHelper
+
+  it 'should replace plantuml pre tag with img tag' do
+    stub_application_setting(plantuml_enabled: true, plantuml_url: "http://localhost:8080")
+    input = '<pre class="plantuml"><code>Bob -> Sara : Hello</code><pre>'
+    output = '<div class="imageblock"><div class="content"><img class="plantuml" src="http://localhost:8080/png/U9npoazIqBLJ24uiIbImKl18pSd91m0rkGMq"></div></div>'
+    doc = filter(input)
+
+    expect(doc.to_s).to eq output
+  end
+
+  it 'should not replace plantuml pre tag with img tag if disabled' do
+    stub_application_setting(plantuml_enabled: false)
+    input = '<pre class="plantuml"><code>Bob -> Sara : Hello</code><pre>'
+    output = '<pre class="plantuml"><code>Bob -&gt; Sara : Hello</code><pre></pre></pre>'
+    doc = filter(input)
+
+    expect(doc.to_s).to eq output
+  end
+
+  it 'should not replace plantuml pre tag with img tag if url is invalid' do
+    stub_application_setting(plantuml_enabled: true, plantuml_url: "invalid")
+    input = '<pre class="plantuml"><code>Bob -> Sara : Hello</code><pre>'
+    output = '<div class="listingblock"><div class="content"><pre class="plantuml plantuml-error"> PlantUML Error: cannot connect to PlantUML server at "invalid"</pre></div></div>'
+    doc = filter(input)
+
+    expect(doc.to_s).to eq output
+  end
+end
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb
index f5822fed37c..8e3e4034c8f 100644
--- a/spec/lib/gitlab/diff/position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer_spec.rb
@@ -99,7 +99,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
     Files::CreateService.new(
       project,
       current_user,
-      source_branch: branch_name,
+      start_branch: branch_name,
       target_branch: branch_name,
       commit_message: "Create file",
       file_path: file_name,
@@ -112,7 +112,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
     Files::UpdateService.new(
       project,
       current_user,
-      source_branch: branch_name,
+      start_branch: branch_name,
       target_branch: branch_name,
       commit_message: "Update file",
       file_path: file_name,
@@ -125,7 +125,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
     Files::DeleteService.new(
       project,
       current_user,
-      source_branch: branch_name,
+      start_branch: branch_name,
       target_branch: branch_name,
       commit_message: "Delete file",
       file_path: file_name
@@ -1640,7 +1640,9 @@ describe Gitlab::Diff::PositionTracer, lib: true do
         }
 
         merge_request = create(:merge_request, source_branch: second_create_file_commit.sha, target_branch: branch_name, source_project: project)
-        repository.merge(current_user, merge_request, options)
+
+        repository.merge(current_user, merge_request.diff_head_sha, merge_request, options)
+
         project.commit(branch_name)
       end
 
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index b080be62b34..116ab16ae74 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -209,7 +209,13 @@ describe Gitlab::GitAccess, lib: true do
         stub_git_hooks
         project.repository.add_branch(user, unprotected_branch, 'feature')
         target_branch = project.repository.lookup('feature')
-        source_branch = project.repository.commit_file(user, FFaker::InternetSE.login_user_name, FFaker::HipsterIpsum.paragraph, FFaker::HipsterIpsum.sentence, unprotected_branch, false)
+        source_branch = project.repository.commit_file(
+          user,
+          FFaker::InternetSE.login_user_name,
+          FFaker::HipsterIpsum.paragraph,
+          message: FFaker::HipsterIpsum.sentence,
+          branch_name: unprotected_branch,
+          update: false)
         rugged = project.repository.rugged
         author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
 
diff --git a/spec/lib/gitlab/template/issue_template_spec.rb b/spec/lib/gitlab/template/issue_template_spec.rb
index 45cec65a284..1335a2b8f35 100644
--- a/spec/lib/gitlab/template/issue_template_spec.rb
+++ b/spec/lib/gitlab/template/issue_template_spec.rb
@@ -4,16 +4,14 @@ describe Gitlab::Template::IssueTemplate do
   subject { described_class }
 
   let(:user) { create(:user) }
-  let(:project) { create(:project, :repository) }
-  let(:file_path_1) { '.gitlab/issue_templates/bug.md' }
-  let(:file_path_2) { '.gitlab/issue_templates/template_test.md' }
-  let(:file_path_3) { '.gitlab/issue_templates/feature_proposal.md' }
-
-  before do
-    project.add_user(user, Gitlab::Access::MASTER)
-    project.repository.commit_file(user, file_path_1, "something valid", "test 3", "master", false)
-    project.repository.commit_file(user, file_path_2, "template_test", "test 1", "master", false)
-    project.repository.commit_file(user, file_path_3, "feature_proposal", "test 2", "master", false)
+
+  let(:project) do
+    create(:project,
+      :repository,
+      create_template: {
+        user: user,
+        access: Gitlab::Access::MASTER,
+        path: 'issue_templates' })
   end
 
   describe '.all' do
diff --git a/spec/lib/gitlab/template/merge_request_template_spec.rb b/spec/lib/gitlab/template/merge_request_template_spec.rb
index ae51b79be22..320b870309a 100644
--- a/spec/lib/gitlab/template/merge_request_template_spec.rb
+++ b/spec/lib/gitlab/template/merge_request_template_spec.rb
@@ -4,16 +4,14 @@ describe Gitlab::Template::MergeRequestTemplate do
   subject { described_class }
 
   let(:user) { create(:user) }
-  let(:project) { create(:project, :repository) }
-  let(:file_path_1) { '.gitlab/merge_request_templates/bug.md' }
-  let(:file_path_2) { '.gitlab/merge_request_templates/template_test.md' }
-  let(:file_path_3) { '.gitlab/merge_request_templates/feature_proposal.md' }
-
-  before do
-    project.add_user(user, Gitlab::Access::MASTER)
-    project.repository.commit_file(user, file_path_1, "something valid", "test 3", "master", false)
-    project.repository.commit_file(user, file_path_2, "template_test", "test 1", "master", false)
-    project.repository.commit_file(user, file_path_3, "feature_proposal", "test 2", "master", false)
+
+  let(:project) do
+    create(:project,
+      :repository,
+      create_template: {
+        user: user,
+        access: Gitlab::Access::MASTER,
+        path: 'merge_request_templates' })
   end
 
   describe '.all' do
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index e20b394c525..4080092405d 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -484,11 +484,11 @@ describe Ci::Build, :models do
         let!(:build) { create(:ci_build, :trace, :success, :artifacts) }
         subject { build.erased? }
 
-        context 'build has not been erased' do
+        context 'job has not been erased' do
           it { is_expected.to be_falsey }
         end
 
-        context 'build has been erased' do
+        context 'job has been erased' do
           before do
             build.erase
           end
diff --git a/spec/models/cycle_analytics/production_spec.rb b/spec/models/cycle_analytics/production_spec.rb
index 2cbee741fb0..b9fe492fe2c 100644
--- a/spec/models/cycle_analytics/production_spec.rb
+++ b/spec/models/cycle_analytics/production_spec.rb
@@ -21,7 +21,13 @@ describe 'CycleAnalytics#production', feature: true do
        ["production deploy happens after merge request is merged (along with other changes)",
         lambda do |context, data|
           # Make other changes on master
-          sha = context.project.repository.commit_file(context.user, context.random_git_name, "content", "commit message", 'master', false)
+          sha = context.project.repository.commit_file(
+            context.user,
+            context.random_git_name,
+            'content',
+            message: 'commit message',
+            branch_name: 'master',
+            update: false)
           context.project.repository.commit(sha)
 
           context.deploy_master
diff --git a/spec/models/cycle_analytics/staging_spec.rb b/spec/models/cycle_analytics/staging_spec.rb
index 104e65335dd..9a024d533a1 100644
--- a/spec/models/cycle_analytics/staging_spec.rb
+++ b/spec/models/cycle_analytics/staging_spec.rb
@@ -29,10 +29,10 @@ describe 'CycleAnalytics#staging', feature: true do
                                sha = context.project.repository.commit_file(
                                  context.user,
                                  context.random_git_name,
-                                 "content",
-                                 "commit message",
-                                 'master',
-                                 false)
+                                 'content',
+                                 message: 'commit message',
+                                 branch_name: 'master',
+                                 update: false)
                                context.project.repository.commit(sha)
 
                                context.deploy_master
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index 9e1a52011c3..e6ca4853873 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -19,13 +19,6 @@ describe List do
       expect(subject).to validate_uniqueness_of(:label_id).scoped_to(:board_id)
     end
 
-    context 'when list_type is set to backlog' do
-      subject { described_class.new(list_type: :backlog) }
-
-      it { is_expected.not_to validate_presence_of(:label) }
-      it { is_expected.not_to validate_presence_of(:position) }
-    end
-
     context 'when list_type is set to done' do
       subject { described_class.new(list_type: :done) }
 
@@ -41,12 +34,6 @@ describe List do
       expect(subject.destroy).to be_truthy
     end
 
-    it 'can not be destroyed when list_type is set to backlog' do
-      subject = create(:backlog_list)
-
-      expect(subject.destroy).to be_falsey
-    end
-
     it 'can not be destroyed when when list_type is set to done' do
       subject = create(:done_list)
 
@@ -55,19 +42,13 @@ describe List do
   end
 
   describe '#destroyable?' do
-    it 'retruns true when list_type is set to label' do
+    it 'returns true when list_type is set to label' do
       subject.list_type = :label
 
       expect(subject).to be_destroyable
     end
 
-    it 'retruns false when list_type is set to backlog' do
-      subject.list_type = :backlog
-
-      expect(subject).not_to be_destroyable
-    end
-
-    it 'retruns false when list_type is set to done' do
+    it 'returns false when list_type is set to done' do
       subject.list_type = :done
 
       expect(subject).not_to be_destroyable
@@ -75,19 +56,13 @@ describe List do
   end
 
   describe '#movable?' do
-    it 'retruns true when list_type is set to label' do
+    it 'returns true when list_type is set to label' do
       subject.list_type = :label
 
       expect(subject).to be_movable
     end
 
-    it 'retruns false when list_type is set to backlog' do
-      subject.list_type = :backlog
-
-      expect(subject).not_to be_movable
-    end
-
-    it 'retruns false when list_type is set to done' do
+    it 'returns false when list_type is set to done' do
       subject.list_type = :done
 
       expect(subject).not_to be_movable
@@ -102,12 +77,6 @@ describe List do
       expect(subject.title).to eq 'Development'
     end
 
-    it 'returns Backlog when list_type is set to backlog' do
-      subject.list_type = :backlog
-
-      expect(subject.title).to eq 'Backlog'
-    end
-
     it 'returns Done when list_type is set to done' do
       subject.list_type = :done
 
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 829b69093c9..53b98ba05f8 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -15,7 +15,12 @@ describe Repository, models: true do
 
   let(:merge_commit) do
     merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project)
-    merge_commit_id = repository.merge(user, merge_request, commit_options)
+
+    merge_commit_id = repository.merge(user,
+                                       merge_request.diff_head_sha,
+                                       merge_request,
+                                       commit_options)
+
     repository.commit(merge_commit_id)
   end
 
@@ -289,17 +294,39 @@ describe Repository, models: true do
   describe "#commit_dir" do
     it "commits a change that creates a new directory" do
       expect do
-        repository.commit_dir(user, 'newdir', 'Create newdir', 'master')
+        repository.commit_dir(user, 'newdir',
+          message: 'Create newdir', branch_name: 'master')
       end.to change { repository.commits('master').count }.by(1)
 
       newdir = repository.tree('master', 'newdir')
       expect(newdir.path).to eq('newdir')
     end
 
+    context "when committing to another project" do
+      let(:forked_project) { create(:project) }
+
+      it "creates a fork and commit to the forked project" do
+        expect do
+          repository.commit_dir(user, 'newdir',
+            message: 'Create newdir', branch_name: 'patch',
+            start_branch_name: 'master', start_project: forked_project)
+        end.to change { repository.commits('master').count }.by(0)
+
+        expect(repository.branch_exists?('patch')).to be_truthy
+        expect(forked_project.repository.branch_exists?('patch')).to be_falsy
+
+        newdir = repository.tree('patch', 'newdir')
+        expect(newdir.path).to eq('newdir')
+      end
+    end
+
     context "when an author is specified" do
       it "uses the given email/name to set the commit's author" do
         expect do
-          repository.commit_dir(user, "newdir", "Add newdir", 'master', author_email: author_email, author_name: author_name)
+          repository.commit_dir(user, 'newdir',
+            message: 'Add newdir',
+            branch_name: 'master',
+            author_email: author_email, author_name: author_name)
         end.to change { repository.commits('master').count }.by(1)
 
         last_commit = repository.commit
@@ -314,8 +341,9 @@ describe Repository, models: true do
     it 'commits change to a file successfully' do
       expect do
         repository.commit_file(user, 'CHANGELOG', 'Changelog!',
-                              'Updates file content',
-                              'master', true)
+                               message: 'Updates file content',
+                               branch_name: 'master',
+                               update: true)
       end.to change { repository.commits('master').count }.by(1)
 
       blob = repository.blob_at('master', 'CHANGELOG')
@@ -326,8 +354,12 @@ describe Repository, models: true do
     context "when an author is specified" do
       it "uses the given email/name to set the commit's author" do
         expect do
-          repository.commit_file(user, "README", 'README!', 'Add README',
-                                'master', true, author_email: author_email, author_name: author_name)
+          repository.commit_file(user, 'README', 'README!',
+                                 message: 'Add README',
+                                 branch_name: 'master',
+                                 update: true,
+                                 author_email: author_email,
+                                 author_name: author_name)
         end.to change { repository.commits('master').count }.by(1)
 
         last_commit = repository.commit
@@ -342,7 +374,7 @@ describe Repository, models: true do
     it 'updates filename successfully' do
       expect do
         repository.update_file(user, 'NEWLICENSE', 'Copyright!',
-                                     branch: 'master',
+                                     branch_name: 'master',
                                      previous_path: 'LICENSE',
                                      message: 'Changes filename')
       end.to change { repository.commits('master').count }.by(1)
@@ -355,15 +387,16 @@ describe Repository, models: true do
 
     context "when an author is specified" do
       it "uses the given email/name to set the commit's author" do
-        repository.commit_file(user, "README", 'README!', 'Add README', 'master', true)
+        repository.commit_file(user, 'README', 'README!',
+          message: 'Add README', branch_name: 'master', update: true)
 
         expect do
-          repository.update_file(user, 'README', "Updated README!",
-                                branch: 'master',
-                                previous_path: 'README',
-                                message: 'Update README',
-                                author_email: author_email,
-                                author_name: author_name)
+          repository.update_file(user, 'README', 'Updated README!',
+                                 branch_name: 'master',
+                                 previous_path: 'README',
+                                 message: 'Update README',
+                                 author_email: author_email,
+                                 author_name: author_name)
         end.to change { repository.commits('master').count }.by(1)
 
         last_commit = repository.commit
@@ -376,10 +409,12 @@ describe Repository, models: true do
 
   describe "#remove_file" do
     it 'removes file successfully' do
-      repository.commit_file(user, "README", 'README!', 'Add README', 'master', true)
+      repository.commit_file(user, 'README', 'README!',
+        message: 'Add README', branch_name: 'master', update: true)
 
       expect do
-        repository.remove_file(user, "README", "Remove README", 'master')
+        repository.remove_file(user, 'README',
+          message: 'Remove README', branch_name: 'master')
       end.to change { repository.commits('master').count }.by(1)
 
       expect(repository.blob_at('master', 'README')).to be_nil
@@ -387,10 +422,13 @@ describe Repository, models: true do
 
     context "when an author is specified" do
       it "uses the given email/name to set the commit's author" do
-        repository.commit_file(user, "README", 'README!', 'Add README', 'master', true)
+        repository.commit_file(user, 'README', 'README!',
+          message: 'Add README', branch_name: 'master', update: true)
 
         expect do
-          repository.remove_file(user, "README", "Remove README", 'master', author_email: author_email, author_name: author_name)
+          repository.remove_file(user, 'README',
+            message: 'Remove README', branch_name: 'master',
+            author_email: author_email, author_name: author_name)
         end.to change { repository.commits('master').count }.by(1)
 
         last_commit = repository.commit
@@ -538,11 +576,14 @@ describe Repository, models: true do
 
   describe "#license_blob", caching: true do
     before do
-      repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
+      repository.remove_file(
+        user, 'LICENSE', message: 'Remove LICENSE', branch_name: 'master')
     end
 
     it 'handles when HEAD points to non-existent ref' do
-      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
+      repository.commit_file(
+        user, 'LICENSE', 'Copyright!',
+        message: 'Add LICENSE', branch_name: 'master', update: false)
 
       allow(repository).to receive(:file_on_head).
         and_raise(Rugged::ReferenceError)
@@ -551,21 +592,27 @@ describe Repository, models: true do
     end
 
     it 'looks in the root_ref only' do
-      repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'markdown')
-      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'markdown', false)
+      repository.remove_file(user, 'LICENSE',
+        message: 'Remove LICENSE', branch_name: 'markdown')
+      repository.commit_file(user, 'LICENSE',
+        Licensee::License.new('mit').content,
+        message: 'Add LICENSE', branch_name: 'markdown', update: false)
 
       expect(repository.license_blob).to be_nil
     end
 
     it 'detects license file with no recognizable open-source license content' do
-      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
+      repository.commit_file(user, 'LICENSE', 'Copyright!',
+        message: 'Add LICENSE', branch_name: 'master', update: false)
 
       expect(repository.license_blob.name).to eq('LICENSE')
     end
 
     %w[LICENSE LICENCE LiCensE LICENSE.md LICENSE.foo COPYING COPYING.md].each do |filename|
       it "detects '#{filename}'" do
-        repository.commit_file(user, filename, Licensee::License.new('mit').content, "Add #{filename}", 'master', false)
+        repository.commit_file(user, filename,
+          Licensee::License.new('mit').content,
+          message: "Add #{filename}", branch_name: 'master', update: false)
 
         expect(repository.license_blob.name).to eq(filename)
       end
@@ -574,7 +621,8 @@ describe Repository, models: true do
 
   describe '#license_key', caching: true do
     before do
-      repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
+      repository.remove_file(user, 'LICENSE',
+        message: 'Remove LICENSE', branch_name: 'master')
     end
 
     it 'returns nil when no license is detected' do
@@ -588,13 +636,16 @@ describe Repository, models: true do
     end
 
     it 'detects license file with no recognizable open-source license content' do
-      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
+      repository.commit_file(user, 'LICENSE', 'Copyright!',
+        message: 'Add LICENSE', branch_name: 'master', update: false)
 
       expect(repository.license_key).to be_nil
     end
 
     it 'returns the license key' do
-      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
+      repository.commit_file(user, 'LICENSE',
+        Licensee::License.new('mit').content,
+        message: 'Add LICENSE', branch_name: 'master', update: false)
 
       expect(repository.license_key).to eq('mit')
     end
@@ -707,7 +758,7 @@ describe Repository, models: true do
         allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, ''])
 
         expect do
-          repository.rm_branch(user, 'new_feature')
+          repository.rm_branch(user, 'feature')
         end.to raise_error(GitHooksService::PreReceiveError)
       end
 
@@ -728,36 +779,51 @@ describe Repository, models: true do
 
     context 'when pre hooks were successful' do
       before do
-        expect_any_instance_of(GitHooksService).to receive(:execute).
-          with(user, repository.path_to_repo, old_rev, new_rev, 'refs/heads/feature').
-          and_yield.and_return(true)
+        service = GitHooksService.new
+        expect(GitHooksService).to receive(:new).and_return(service)
+        expect(service).to receive(:execute).
+          with(
+            user,
+            repository.path_to_repo,
+            old_rev,
+            new_rev,
+            'refs/heads/feature').
+          and_yield(service).and_return(true)
       end
 
       it 'runs without errors' do
         expect do
-          repository.update_branch_with_hooks(user, 'feature') { new_rev }
+          GitOperationService.new(user, repository).with_branch('feature') do
+            new_rev
+          end
         end.not_to raise_error
       end
 
       it 'ensures the autocrlf Git option is set to :input' do
-        expect(repository).to receive(:update_autocrlf_option)
+        service = GitOperationService.new(user, repository)
 
-        repository.update_branch_with_hooks(user, 'feature') { new_rev }
+        expect(service).to receive(:update_autocrlf_option)
+
+        service.with_branch('feature') { new_rev }
       end
 
       context "when the branch wasn't empty" do
         it 'updates the head' do
           expect(repository.find_branch('feature').dereferenced_target.id).to eq(old_rev)
-          repository.update_branch_with_hooks(user, 'feature') { new_rev }
+
+          GitOperationService.new(user, repository).with_branch('feature') do
+            new_rev
+          end
+
           expect(repository.find_branch('feature').dereferenced_target.id).to eq(new_rev)
         end
       end
     end
 
     context 'when the update adds more than one commit' do
-      it 'runs without errors' do
-        old_rev = '33f3729a45c02fc67d00adb1b8bca394b0e761d9'
+      let(:old_rev) { '33f3729a45c02fc67d00adb1b8bca394b0e761d9' }
 
+      it 'runs without errors' do
         # old_rev is an ancestor of new_rev
         expect(repository.rugged.merge_base(old_rev, new_rev)).to eq(old_rev)
 
@@ -767,22 +833,28 @@ describe Repository, models: true do
         branch = 'feature-ff-target'
         repository.add_branch(user, branch, old_rev)
 
-        expect { repository.update_branch_with_hooks(user, branch) { new_rev } }.not_to raise_error
+        expect do
+          GitOperationService.new(user, repository).with_branch(branch) do
+            new_rev
+          end
+        end.not_to raise_error
       end
     end
 
     context 'when the update would remove commits from the target branch' do
-      it 'raises an exception' do
-        branch = 'master'
-        old_rev = repository.find_branch(branch).dereferenced_target.sha
+      let(:branch) { 'master' }
+      let(:old_rev) { repository.find_branch(branch).dereferenced_target.sha }
 
+      it 'raises an exception' do
         # The 'master' branch is NOT an ancestor of new_rev.
         expect(repository.rugged.merge_base(old_rev, new_rev)).not_to eq(old_rev)
 
         # Updating 'master' to new_rev would lose the commits on 'master' that
         # are not contained in new_rev. This should not be allowed.
         expect do
-          repository.update_branch_with_hooks(user, branch) { new_rev }
+          GitOperationService.new(user, repository).with_branch(branch) do
+            new_rev
+          end
         end.to raise_error(Repository::CommitError)
       end
     end
@@ -792,7 +864,9 @@ describe Repository, models: true do
         allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, ''])
 
         expect do
-          repository.update_branch_with_hooks(user, 'feature') { new_rev }
+          GitOperationService.new(user, repository).with_branch('feature') do
+            new_rev
+          end
         end.to raise_error(GitHooksService::PreReceiveError)
       end
     end
@@ -800,7 +874,6 @@ describe Repository, models: true do
     context 'when target branch is different from source branch' do
       before do
         allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, ''])
-        allow(repository).to receive(:update_ref!)
       end
 
       it 'expires branch cache' do
@@ -809,7 +882,10 @@ describe Repository, models: true do
         expect(repository).not_to receive(:expire_emptiness_caches)
         expect(repository).to     receive(:expire_branches_cache)
 
-        repository.update_branch_with_hooks(user, 'new-feature') { new_rev }
+        GitOperationService.new(user, repository).
+          with_branch('new-feature') do
+            new_rev
+          end
       end
     end
 
@@ -827,7 +903,9 @@ describe Repository, models: true do
         expect(empty_repository).to receive(:expire_branches_cache)
 
         empty_repository.commit_file(user, 'CHANGELOG', 'Changelog!',
-                                     'Updates file content', 'master', false)
+                                     message: 'Updates file content',
+                                     branch_name: 'master',
+                                     update: false)
       end
     end
   end
@@ -877,7 +955,7 @@ describe Repository, models: true do
       end
 
       it 'sets autocrlf to :input' do
-        repository.update_autocrlf_option
+        GitOperationService.new(nil, repository).send(:update_autocrlf_option)
 
         expect(repository.raw_repository.autocrlf).to eq(:input)
       end
@@ -892,7 +970,7 @@ describe Repository, models: true do
         expect(repository.raw_repository).not_to receive(:autocrlf=).
           with(:input)
 
-        repository.update_autocrlf_option
+        GitOperationService.new(nil, repository).send(:update_autocrlf_option)
       end
     end
   end
@@ -1009,8 +1087,11 @@ describe Repository, models: true do
 
     it 'sets the `in_progress_merge_commit_sha` flag for the given merge request' do
       merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project)
-      merge_commit_id = repository.merge(user, merge_request, commit_options)
-      repository.commit(merge_commit_id)
+
+      merge_commit_id = repository.merge(user,
+                                         merge_request.diff_head_sha,
+                                         merge_request,
+                                         commit_options)
 
       expect(merge_request.in_progress_merge_commit_sha).to eq(merge_commit_id)
     end
@@ -1388,9 +1469,10 @@ describe Repository, models: true do
   describe '#rm_tag' do
     it 'removes a tag' do
       expect(repository).to receive(:before_remove_tag)
-      expect(repository.rugged.tags).to receive(:delete).with('v1.1.0')
 
-      repository.rm_tag('v1.1.0')
+      repository.rm_tag(create(:user), 'v1.1.0')
+
+      expect(repository.find_tag('v1.1.0')).to be_nil
     end
   end
 
@@ -1458,16 +1540,16 @@ describe Repository, models: true do
     end
   end
 
-  describe '#update_ref!' do
+  describe '#update_ref' do
     it 'can create a ref' do
-      repository.update_ref!('refs/heads/foobar', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
+      GitOperationService.new(nil, repository).send(:update_ref, 'refs/heads/foobar', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
 
       expect(repository.find_branch('foobar')).not_to be_nil
     end
 
     it 'raises CommitError when the ref update fails' do
       expect do
-        repository.update_ref!('refs/heads/master', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
+        GitOperationService.new(nil, repository).send(:update_ref, 'refs/heads/master', 'refs/heads/master', Gitlab::Git::BLANK_SHA)
       end.to raise_error(Repository::CommitError)
     end
   end
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index bd6e23ee769..f197fadebab 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -86,7 +86,7 @@ describe API::Builds, api: true do
 
     context 'when commit exists in repository' do
       context 'when user is authorized' do
-        context 'when pipeline has builds' do
+        context 'when pipeline has jobs' do
           before do
             create(:ci_pipeline, project: project, sha: project.commit.id)
             create(:ci_build, pipeline: pipeline)
@@ -95,7 +95,7 @@ describe API::Builds, api: true do
             get api("/projects/#{project.id}/repository/commits/#{project.commit.id}/builds", api_user)
           end
 
-          it 'returns project builds for specific commit' do
+          it 'returns project jobs for specific commit' do
             expect(response).to have_http_status(200)
             expect(json_response).to be_an Array
             expect(json_response.size).to eq 2
@@ -111,7 +111,7 @@ describe API::Builds, api: true do
           end
         end
 
-        context 'when pipeline has no builds' do
+        context 'when pipeline has no jobs' do
           before do
             branch_head = project.commit('feature').id
             get api("/projects/#{project.id}/repository/commits/#{branch_head}/builds", api_user)
@@ -133,7 +133,7 @@ describe API::Builds, api: true do
           get api("/projects/#{project.id}/repository/commits/#{project.commit.id}/builds", nil)
         end
 
-        it 'does not return project builds' do
+        it 'does not return project jobs' do
           expect(response).to have_http_status(401)
           expect(json_response.except('message')).to be_empty
         end
@@ -147,7 +147,7 @@ describe API::Builds, api: true do
     end
 
     context 'authorized user' do
-      it 'returns specific build data' do
+      it 'returns specific job data' do
         expect(response).to have_http_status(200)
         expect(json_response['name']).to eq('test')
       end
@@ -165,7 +165,7 @@ describe API::Builds, api: true do
     context 'unauthorized user' do
       let(:api_user) { nil }
 
-      it 'does not return specific build data' do
+      it 'does not return specific job data' do
         expect(response).to have_http_status(401)
       end
     end
@@ -176,7 +176,7 @@ describe API::Builds, api: true do
       get api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
     end
 
-    context 'build with artifacts' do
+    context 'job with artifacts' do
       let(:build) { create(:ci_build, :artifacts, pipeline: pipeline) }
 
       context 'authorized user' do
@@ -185,7 +185,7 @@ describe API::Builds, api: true do
             'Content-Disposition' => 'attachment; filename=ci_build_artifacts.zip' }
         end
 
-        it 'returns specific build artifacts' do
+        it 'returns specific job artifacts' do
           expect(response).to have_http_status(200)
           expect(response.headers).to include(download_headers)
         end
@@ -194,13 +194,13 @@ describe API::Builds, api: true do
       context 'unauthorized user' do
         let(:api_user) { nil }
 
-        it 'does not return specific build artifacts' do
+        it 'does not return specific job artifacts' do
           expect(response).to have_http_status(401)
         end
       end
     end
 
-    it 'does not return build artifacts if not uploaded' do
+    it 'does not return job artifacts if not uploaded' do
       expect(response).to have_http_status(404)
     end
   end
@@ -241,7 +241,7 @@ describe API::Builds, api: true do
       end
     end
 
-    context 'non-existing build' do
+    context 'non-existing job' do
       shared_examples 'not found' do
         it { expect(response).to have_http_status(:not_found) }
       end
@@ -254,7 +254,7 @@ describe API::Builds, api: true do
         it_behaves_like 'not found'
       end
 
-      context 'has no such build' do
+      context 'has no such job' do
         before do
           get path_for_ref(pipeline.ref, 'NOBUILD')
         end
@@ -263,7 +263,7 @@ describe API::Builds, api: true do
       end
     end
 
-    context 'find proper build' do
+    context 'find proper job' do
       shared_examples 'a valid file' do
         let(:download_headers) do
           { 'Content-Transfer-Encoding' => 'binary',
@@ -311,7 +311,7 @@ describe API::Builds, api: true do
     end
 
     context 'authorized user' do
-      it 'returns specific build trace' do
+      it 'returns specific job trace' do
         expect(response).to have_http_status(200)
         expect(response.body).to eq(build.trace)
       end
@@ -320,7 +320,7 @@ describe API::Builds, api: true do
     context 'unauthorized user' do
       let(:api_user) { nil }
 
-      it 'does not return specific build trace' do
+      it 'does not return specific job trace' do
         expect(response).to have_http_status(401)
       end
     end
@@ -333,7 +333,7 @@ describe API::Builds, api: true do
 
     context 'authorized user' do
       context 'user with :update_build persmission' do
-        it 'cancels running or pending build' do
+        it 'cancels running or pending job' do
           expect(response).to have_http_status(201)
           expect(project.builds.first.status).to eq('canceled')
         end
@@ -342,7 +342,7 @@ describe API::Builds, api: true do
       context 'user without :update_build permission' do
         let(:api_user) { reporter.user }
 
-        it 'does not cancel build' do
+        it 'does not cancel job' do
           expect(response).to have_http_status(403)
         end
       end
@@ -351,7 +351,7 @@ describe API::Builds, api: true do
     context 'unauthorized user' do
       let(:api_user) { nil }
 
-      it 'does not cancel build' do
+      it 'does not cancel job' do
         expect(response).to have_http_status(401)
       end
     end
@@ -366,7 +366,7 @@ describe API::Builds, api: true do
 
     context 'authorized user' do
       context 'user with :update_build permission' do
-        it 'retries non-running build' do
+        it 'retries non-running job' do
           expect(response).to have_http_status(201)
           expect(project.builds.first.status).to eq('canceled')
           expect(json_response['status']).to eq('pending')
@@ -376,7 +376,7 @@ describe API::Builds, api: true do
       context 'user without :update_build permission' do
         let(:api_user) { reporter.user }
 
-        it 'does not retry build' do
+        it 'does not retry job' do
           expect(response).to have_http_status(403)
         end
       end
@@ -385,7 +385,7 @@ describe API::Builds, api: true do
     context 'unauthorized user' do
       let(:api_user) { nil }
 
-      it 'does not retry build' do
+      it 'does not retry job' do
         expect(response).to have_http_status(401)
       end
     end
@@ -396,23 +396,23 @@ describe API::Builds, api: true do
       post api("/projects/#{project.id}/builds/#{build.id}/erase", user)
     end
 
-    context 'build is erasable' do
+    context 'job is erasable' do
       let(:build) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: pipeline) }
 
-      it 'erases build content' do
+      it 'erases job content' do
         expect(response.status).to eq 201
         expect(build.trace).to be_empty
         expect(build.artifacts_file.exists?).to be_falsy
         expect(build.artifacts_metadata.exists?).to be_falsy
       end
 
-      it 'updates build' do
+      it 'updates job' do
         expect(build.reload.erased_at).to be_truthy
         expect(build.reload.erased_by).to eq user
       end
     end
 
-    context 'build is not erasable' do
+    context 'job is not erasable' do
       let(:build) { create(:ci_build, :trace, project: project, pipeline: pipeline) }
 
       it 'responds with forbidden' do
@@ -452,20 +452,20 @@ describe API::Builds, api: true do
       post api("/projects/#{project.id}/builds/#{build.id}/play", user)
     end
 
-    context 'on an playable build' do
+    context 'on an playable job' do
       let(:build) { create(:ci_build, :manual, project: project, pipeline: pipeline) }
 
-      it 'plays the build' do
+      it 'plays the job' do
         expect(response).to have_http_status 200
         expect(json_response['user']['id']).to eq(user.id)
         expect(json_response['id']).to eq(build.id)
       end
     end
 
-    context 'on a non-playable build' do
+    context 'on a non-playable job' do
       it 'returns a status code 400, Bad Request' do
         expect(response).to have_http_status 400
-        expect(response.body).to match("Unplayable Build")
+        expect(response.body).to match("Unplayable Job")
       end
     end
   end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 5bf5bf0739e..8692f9da976 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -305,6 +305,13 @@ describe API::Users, api: true  do
       expect(user.reload.bio).to eq('new test bio')
     end
 
+    it "updates user with new password and forces reset on next login" do
+      put api("/users/#{user.id}", admin), password: '12345678'
+
+      expect(response).to have_http_status(200)
+      expect(user.reload.password_expires_at).to be <= Time.now
+    end
+
     it "updates user with organization" do
       put api("/users/#{user.id}", admin), { organization: 'GitLab' }
 
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 1cedaa4ba63..d85afdeab42 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -288,7 +288,7 @@ describe Ci::API::Builds do
         expect(build.reload.trace).to eq 'BUILD TRACE'
       end
 
-      context 'build has been erased' do
+      context 'job has been erased' do
         let(:build) { create(:ci_build, runner_id: runner.id, erased_at: Time.now) }
 
         it 'responds with forbidden' do
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 77549db2927..96889abee79 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'project routing' do
   before do
-    allow(Project).to receive(:find_with_namespace).and_return(false)
-    allow(Project).to receive(:find_with_namespace).with('gitlab/gitlabhq').and_return(true)
+    allow(Project).to receive(:find_by_full_path).and_return(false)
+    allow(Project).to receive(:find_by_full_path).with('gitlab/gitlabhq').and_return(true)
   end
 
   # Shared examples for a resource inside a Project
@@ -86,13 +86,13 @@ describe 'project routing' do
       end
 
       context 'name with dot' do
-        before { allow(Project).to receive(:find_with_namespace).with('gitlab/gitlabhq.keys').and_return(true) }
+        before { allow(Project).to receive(:find_by_full_path).with('gitlab/gitlabhq.keys').and_return(true) }
 
         it { expect(get('/gitlab/gitlabhq.keys')).to route_to('projects#show', namespace_id: 'gitlab', id: 'gitlabhq.keys') }
       end
 
       context 'with nested group' do
-        before { allow(Project).to receive(:find_with_namespace).with('gitlab/subgroup/gitlabhq').and_return(true) }
+        before { allow(Project).to receive(:find_by_full_path).with('gitlab/subgroup/gitlabhq').and_return(true) }
 
         it { expect(get('/gitlab/subgroup/gitlabhq')).to route_to('projects#show', namespace_id: 'gitlab/subgroup', id: 'gitlabhq') }
       end
diff --git a/spec/services/boards/create_service_spec.rb b/spec/services/boards/create_service_spec.rb
index fde807cc410..7b29b043296 100644
--- a/spec/services/boards/create_service_spec.rb
+++ b/spec/services/boards/create_service_spec.rb
@@ -11,12 +11,11 @@ describe Boards::CreateService, services: true do
         expect { service.execute }.to change(Board, :count).by(1)
       end
 
-      it 'creates default lists' do
+      it 'creates the default lists' do
         board = service.execute
 
-        expect(board.lists.size).to eq 2
-        expect(board.lists.first).to be_backlog
-        expect(board.lists.last).to be_done
+        expect(board.lists.size).to eq 1
+        expect(board.lists.first).to be_done
       end
     end
 
diff --git a/spec/services/boards/issues/list_service_spec.rb b/spec/services/boards/issues/list_service_spec.rb
index 7c206cf3ce7..305278843f5 100644
--- a/spec/services/boards/issues/list_service_spec.rb
+++ b/spec/services/boards/issues/list_service_spec.rb
@@ -13,7 +13,6 @@ describe Boards::Issues::ListService, services: true do
     let(:p2) { create(:label, title: 'P2', project: project, priority: 2) }
     let(:p3) { create(:label, title: 'P3', project: project, priority: 3) }
 
-    let!(:backlog) { create(:backlog_list, board: board) }
     let!(:list1)   { create(:list, board: board, label: development, position: 0) }
     let!(:list2)   { create(:list, board: board, label: testing, position: 1) }
     let!(:done)    { create(:done_list, board: board) }
@@ -45,8 +44,8 @@ describe Boards::Issues::ListService, services: true do
     end
 
     context 'sets default order to priority' do
-      it 'returns opened issues when listing issues from Backlog' do
-        params = { board_id: board.id, id: backlog.id }
+      it 'returns opened issues when list id is missing' do
+        params = { board_id: board.id }
 
         issues = described_class.new(project, user, params).execute
 
diff --git a/spec/services/boards/issues/move_service_spec.rb b/spec/services/boards/issues/move_service_spec.rb
index c43b2aec490..77f75167b3d 100644
--- a/spec/services/boards/issues/move_service_spec.rb
+++ b/spec/services/boards/issues/move_service_spec.rb
@@ -10,7 +10,6 @@ describe Boards::Issues::MoveService, services: true do
     let(:development) { create(:label, project: project, name: 'Development') }
     let(:testing)  { create(:label, project: project, name: 'Testing') }
 
-    let!(:backlog) { create(:backlog_list, board: board1) }
     let!(:list1)   { create(:list, board: board1, label: development, position: 0) }
     let!(:list2)   { create(:list, board: board1, label: testing, position: 1) }
     let!(:done)    { create(:done_list, board: board1) }
@@ -19,41 +18,6 @@ describe Boards::Issues::MoveService, services: true do
       project.team << [user, :developer]
     end
 
-    context 'when moving from backlog' do
-      it 'adds the label of the list it goes to' do
-        issue = create(:labeled_issue, project: project, labels: [bug])
-        params = { board_id: board1.id, from_list_id: backlog.id, to_list_id: list1.id }
-
-        described_class.new(project, user, params).execute(issue)
-
-        expect(issue.reload.labels).to contain_exactly(bug, development)
-      end
-    end
-
-    context 'when moving to backlog' do
-      it 'removes all list-labels' do
-        issue = create(:labeled_issue, project: project, labels: [bug, development, testing])
-        params = { board_id: board1.id, from_list_id: list1.id, to_list_id: backlog.id }
-
-        described_class.new(project, user, params).execute(issue)
-
-        expect(issue.reload.labels).to contain_exactly(bug)
-      end
-    end
-
-    context 'when moving from backlog to done' do
-      it 'closes the issue' do
-        issue = create(:labeled_issue, project: project, labels: [bug])
-        params = { board_id: board1.id, from_list_id: backlog.id, to_list_id: done.id }
-
-        described_class.new(project, user, params).execute(issue)
-        issue.reload
-
-        expect(issue.labels).to contain_exactly(bug)
-        expect(issue).to be_closed
-      end
-    end
-
     context 'when moving an issue between lists' do
       let(:issue)  { create(:labeled_issue, project: project, labels: [bug, development]) }
       let(:params) { { board_id: board1.id, from_list_id: list1.id, to_list_id: list2.id } }
@@ -113,19 +77,6 @@ describe Boards::Issues::MoveService, services: true do
       end
     end
 
-    context 'when moving from done to backlog' do
-      it 'reopens the issue' do
-        issue = create(:labeled_issue, :closed, project: project, labels: [bug])
-        params = { board_id: board1.id, from_list_id: done.id, to_list_id: backlog.id }
-
-        described_class.new(project, user, params).execute(issue)
-        issue.reload
-
-        expect(issue.labels).to contain_exactly(bug)
-        expect(issue).to be_reopened
-      end
-    end
-
     context 'when moving to same list' do
       let(:issue)  { create(:labeled_issue, project: project, labels: [bug, development]) }
       let(:params) { { board_id: board1.id, from_list_id: list1.id, to_list_id: list1.id } }
diff --git a/spec/services/boards/lists/create_service_spec.rb b/spec/services/boards/lists/create_service_spec.rb
index a7e9efcf93f..ebac38e68f1 100644
--- a/spec/services/boards/lists/create_service_spec.rb
+++ b/spec/services/boards/lists/create_service_spec.rb
@@ -21,7 +21,7 @@ describe Boards::Lists::CreateService, services: true do
       end
     end
 
-    context 'when board lists has backlog, and done lists' do
+    context 'when board lists has the done list' do
       it 'creates a new list at beginning of the list' do
         list = service.execute(board)
 
@@ -40,7 +40,7 @@ describe Boards::Lists::CreateService, services: true do
       end
     end
 
-    context 'when board lists has backlog, label and done lists' do
+    context 'when board lists has label and done lists' do
       it 'creates a new list at end of the label lists' do
         list1 = create(:list, board: board, position: 0)
 
diff --git a/spec/services/boards/lists/destroy_service_spec.rb b/spec/services/boards/lists/destroy_service_spec.rb
index 628caf03476..a30860f828a 100644
--- a/spec/services/boards/lists/destroy_service_spec.rb
+++ b/spec/services/boards/lists/destroy_service_spec.rb
@@ -15,7 +15,6 @@ describe Boards::Lists::DestroyService, services: true do
       end
 
       it 'decrements position of higher lists' do
-        backlog     = board.backlog_list
         development = create(:list, board: board, position: 0)
         review      = create(:list, board: board, position: 1)
         staging     = create(:list, board: board, position: 2)
@@ -23,20 +22,12 @@ describe Boards::Lists::DestroyService, services: true do
 
         described_class.new(project, user).execute(development)
 
-        expect(backlog.reload.position).to be_nil
         expect(review.reload.position).to eq 0
         expect(staging.reload.position).to eq 1
         expect(done.reload.position).to be_nil
       end
     end
 
-    it 'does not remove list from board when list type is backlog' do
-      list = board.backlog_list
-      service = described_class.new(project, user)
-
-      expect { service.execute(list) }.not_to change(board.lists, :count)
-    end
-
     it 'does not remove list from board when list type is done' do
       list = board.done_list
       service = described_class.new(project, user)
diff --git a/spec/services/boards/lists/list_service_spec.rb b/spec/services/boards/lists/list_service_spec.rb
index 334cee3f06d..2dffc62b215 100644
--- a/spec/services/boards/lists/list_service_spec.rb
+++ b/spec/services/boards/lists/list_service_spec.rb
@@ -10,7 +10,7 @@ describe Boards::Lists::ListService, services: true do
 
       service = described_class.new(project, double)
 
-      expect(service.execute(board)).to eq [board.backlog_list, list, board.done_list]
+      expect(service.execute(board)).to eq [list, board.done_list]
     end
   end
 end
diff --git a/spec/services/boards/lists/move_service_spec.rb b/spec/services/boards/lists/move_service_spec.rb
index 63fa0bb8c5f..3786dc82bf0 100644
--- a/spec/services/boards/lists/move_service_spec.rb
+++ b/spec/services/boards/lists/move_service_spec.rb
@@ -6,7 +6,6 @@ describe Boards::Lists::MoveService, services: true do
     let(:board)   { create(:board, project: project) }
     let(:user)    { create(:user) }
 
-    let!(:backlog)     { create(:backlog_list, board: board) }
     let!(:planning)    { create(:list, board: board, position: 0) }
     let!(:development) { create(:list, board: board, position: 1) }
     let!(:review)      { create(:list, board: board, position: 2) }
@@ -87,14 +86,6 @@ describe Boards::Lists::MoveService, services: true do
       end
     end
 
-    it 'keeps position of lists when list type is backlog' do
-      service = described_class.new(project, user, position: 2)
-
-      service.execute(backlog)
-
-      expect(current_list_positions).to eq [0, 1, 2, 3]
-    end
-
     it 'keeps position of lists when list type is done' do
       service = described_class.new(project, user, position: 2)
 
diff --git a/spec/services/compare_service_spec.rb b/spec/services/compare_service_spec.rb
index 3760f19aaa2..0a7fc58523f 100644
--- a/spec/services/compare_service_spec.rb
+++ b/spec/services/compare_service_spec.rb
@@ -3,17 +3,17 @@ require 'spec_helper'
 describe CompareService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
-  let(:service) { described_class.new }
+  let(:service) { described_class.new(project, 'feature') }
 
   describe '#execute' do
     context 'compare with base, like feature...fix' do
-      subject { service.execute(project, 'feature', project, 'fix', straight: false) }
+      subject { service.execute(project, 'fix', straight: false) }
 
       it { expect(subject.diffs.size).to eq(1) }
     end
 
     context 'straight compare, like feature..fix' do
-      subject { service.execute(project, 'feature', project, 'fix', straight: true) }
+      subject { service.execute(project, 'fix', straight: true) }
 
       it { expect(subject.diffs.size).to eq(3) }
     end
diff --git a/spec/services/files/update_service_spec.rb b/spec/services/files/update_service_spec.rb
index d3c37c7820f..35e6e139238 100644
--- a/spec/services/files/update_service_spec.rb
+++ b/spec/services/files/update_service_spec.rb
@@ -6,7 +6,10 @@ describe Files::UpdateService do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:file_path) { 'files/ruby/popen.rb' }
-  let(:new_contents) { "New Content" }
+  let(:new_contents) { 'New Content' }
+  let(:target_branch) { project.default_branch }
+  let(:last_commit_sha) { nil }
+
   let(:commit_params) do
     {
       file_path: file_path,
@@ -14,9 +17,9 @@ describe Files::UpdateService do
       file_content: new_contents,
       file_content_encoding: "text",
       last_commit_sha: last_commit_sha,
-      source_project: project,
-      source_branch: project.default_branch,
-      target_branch: project.default_branch,
+      start_project: project,
+      start_branch: project.default_branch,
+      target_branch: target_branch
     }
   end
 
@@ -54,18 +57,6 @@ describe Files::UpdateService do
     end
 
     context "when the last_commit_sha is not supplied" do
-      let(:commit_params) do
-        {
-          file_path: file_path,
-          commit_message: "Update File",
-          file_content: new_contents,
-          file_content_encoding: "text",
-          source_project: project,
-          source_branch: project.default_branch,
-          target_branch: project.default_branch,
-        }
-      end
-
       it "returns a hash with the :success status " do
         results = subject.execute
 
@@ -80,5 +71,15 @@ describe Files::UpdateService do
         expect(results.data).to eq(new_contents)
       end
     end
+
+    context 'when target branch is different than source branch' do
+      let(:target_branch) { "#{project.default_branch}-new" }
+
+      it 'fires hooks only once' do
+        expect(GitHooksService).to receive(:new).once.and_call_original
+
+        subject.execute
+      end
+    end
   end
 end
diff --git a/spec/services/git_hooks_service_spec.rb b/spec/services/git_hooks_service_spec.rb
index 41b0968b8b4..3318dfb22b6 100644
--- a/spec/services/git_hooks_service_spec.rb
+++ b/spec/services/git_hooks_service_spec.rb
@@ -21,7 +21,7 @@ describe GitHooksService, services: true do
         hook = double(trigger: [true, nil])
         expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
 
-        expect(service.execute(user, @repo_path, @blankrev, @newrev, @ref) { }).to eq([true, nil])
+        service.execute(user, @repo_path, @blankrev, @newrev, @ref) { }
       end
     end
 
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 314ea670a71..2cc21acab7b 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -89,7 +89,7 @@ describe MergeRequests::RefreshService, services: true do
         # Merge master -> feature branch
         author = { email: 'test@gitlab.com', time: Time.now, name: "Me" }
         commit_options = { message: 'Test message', committer: author, author: author }
-        @project.repository.merge(@user, @merge_request, commit_options)
+        @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, commit_options)
         commit = @project.repository.commit('feature')
         service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature')
         reload_mrs
diff --git a/spec/services/merge_requests/resolve_service_spec.rb b/spec/services/merge_requests/resolve_service_spec.rb
index 388abb6a0df..a0e51681725 100644
--- a/spec/services/merge_requests/resolve_service_spec.rb
+++ b/spec/services/merge_requests/resolve_service_spec.rb
@@ -66,7 +66,13 @@ describe MergeRequests::ResolveService do
 
       context 'when the source project is a fork and does not contain the HEAD of the target branch' do
         let!(:target_head) do
-          project.repository.commit_file(user, 'new-file-in-target', '', 'Add new file in target', 'conflict-start', false)
+          project.repository.commit_file(
+            user,
+            'new-file-in-target',
+            '',
+            message: 'Add new file in target',
+            branch_name: 'conflict-start',
+            update: false)
         end
 
         before do
diff --git a/spec/services/slash_commands/interpret_service_spec.rb b/spec/services/slash_commands/interpret_service_spec.rb
index 66fc8fc360b..0b0925983eb 100644
--- a/spec/services/slash_commands/interpret_service_spec.rb
+++ b/spec/services/slash_commands/interpret_service_spec.rb
@@ -653,5 +653,37 @@ describe SlashCommands::InterpretService, services: true do
         let(:issuable) { issue }
       end
     end
+
+    context '/target_branch command' do
+      let(:non_empty_project) { create(:project) }
+      let(:another_merge_request) { create(:merge_request, author: developer, source_project: non_empty_project) }
+      let(:service) { described_class.new(non_empty_project, developer)}
+
+      it 'updates target_branch if /target_branch command is executed' do
+        _, updates = service.execute('/target_branch merge-test', merge_request)
+
+        expect(updates).to eq(target_branch: 'merge-test')
+      end
+
+      it 'handles blanks around param' do
+        _, updates = service.execute('/target_branch  merge-test     ', merge_request)
+
+        expect(updates).to eq(target_branch: 'merge-test')
+      end
+
+      context 'ignores command with no argument' do
+        it_behaves_like 'empty command' do
+          let(:content) { '/target_branch' }
+          let(:issuable) { another_merge_request }
+        end
+      end
+
+      context 'ignores non-existing target branch' do
+        it_behaves_like 'empty command' do
+          let(:content) { '/target_branch totally_non_existing_branch' }
+          let(:issuable) { another_merge_request }
+        end
+      end
+    end
   end
 end
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb
index 75c95d70951..6ed55289ed9 100644
--- a/spec/support/cycle_analytics_helpers.rb
+++ b/spec/support/cycle_analytics_helpers.rb
@@ -35,7 +35,13 @@ module CycleAnalyticsHelpers
       project.repository.add_branch(user, source_branch, 'master')
     end
 
-    sha = project.repository.commit_file(user, random_git_name, "content", "commit message", source_branch, false)
+    sha = project.repository.commit_file(
+      user,
+      random_git_name,
+      'content',
+      message: 'commit message',
+      branch_name: source_branch,
+      update: false)
     project.repository.commit(sha)
 
     opts = {
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 90f1a9c8798..b87232a350b 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -36,7 +36,8 @@ module TestEnv
     'conflict-non-utf8'                  => 'd0a293c',
     'conflict-too-large'                 => '39fa04f',
     'deleted-image-test'                 => '6c17798',
-    'wip'                                => 'b9238ee'
+    'wip'                                => 'b9238ee',
+    'csv'                                => '3dd0896'
   }
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
diff --git a/spec/views/projects/builds/show.html.haml_spec.rb b/spec/views/projects/builds/show.html.haml_spec.rb
index 44870cfcfb3..b6f6e7b7a2b 100644
--- a/spec/views/projects/builds/show.html.haml_spec.rb
+++ b/spec/views/projects/builds/show.html.haml_spec.rb
@@ -15,7 +15,7 @@ describe 'projects/builds/show', :view do
     allow(view).to receive(:can?).and_return(true)
   end
 
-  describe 'build information in header' do
+  describe 'job information in header' do
     let(:build) do
       create(:ci_build, :success, environment: 'staging')
     end
@@ -28,11 +28,11 @@ describe 'projects/builds/show', :view do
       expect(rendered).to have_css('.ci-status.ci-success', text: 'passed')
     end
 
-    it 'does not render a link to the build' do
+    it 'does not render a link to the job' do
       expect(rendered).not_to have_link('passed')
     end
 
-    it 'shows build id' do
+    it 'shows job id' do
       expect(rendered).to have_css('.js-build-id', text: build.id)
     end
 
@@ -45,8 +45,8 @@ describe 'projects/builds/show', :view do
     end
   end
 
-  describe 'environment info in build view' do
-    context 'build with latest deployment' do
+  describe 'environment info in job view' do
+    context 'job with latest deployment' do
       let(:build) do
         create(:ci_build, :success, environment: 'staging')
       end
@@ -57,7 +57,7 @@ describe 'projects/builds/show', :view do
       end
 
       it 'shows deployment message' do
-        expected_text = 'This build is the most recent deployment'
+        expected_text = 'This job is the most recent deployment'
         render
 
         expect(rendered).to have_css(
@@ -65,7 +65,7 @@ describe 'projects/builds/show', :view do
       end
     end
 
-    context 'build with outdated deployment' do
+    context 'job with outdated deployment' do
       let(:build) do
         create(:ci_build, :success, environment: 'staging', pipeline: pipeline)
       end
@@ -87,7 +87,7 @@ describe 'projects/builds/show', :view do
       end
 
       it 'shows deployment message' do
-        expected_text = 'This build is an out-of-date deployment ' \
+        expected_text = 'This job is an out-of-date deployment ' \
           "to staging.\nView the most recent deployment ##{second_deployment.iid}."
         render
 
@@ -95,7 +95,7 @@ describe 'projects/builds/show', :view do
       end
     end
 
-    context 'build failed to deploy' do
+    context 'job failed to deploy' do
       let(:build) do
         create(:ci_build, :failed, environment: 'staging', pipeline: pipeline)
       end
@@ -105,7 +105,7 @@ describe 'projects/builds/show', :view do
       end
 
       it 'shows deployment message' do
-        expected_text = 'The deployment of this build to staging did not succeed.'
+        expected_text = 'The deployment of this job to staging did not succeed.'
         render
 
         expect(rendered).to have_css(
@@ -113,7 +113,7 @@ describe 'projects/builds/show', :view do
       end
     end
 
-    context 'build will deploy' do
+    context 'job will deploy' do
       let(:build) do
         create(:ci_build, :running, environment: 'staging', pipeline: pipeline)
       end
@@ -124,7 +124,7 @@ describe 'projects/builds/show', :view do
         end
 
         it 'shows deployment message' do
-          expected_text = 'This build is creating a deployment to staging'
+          expected_text = 'This job is creating a deployment to staging'
           render
 
           expect(rendered).to have_css(
@@ -137,7 +137,7 @@ describe 'projects/builds/show', :view do
           end
 
           it 'shows that deployment will be overwritten' do
-            expected_text = 'This build is creating a deployment to staging'
+            expected_text = 'This job is creating a deployment to staging'
             render
 
             expect(rendered).to have_css(
@@ -150,7 +150,7 @@ describe 'projects/builds/show', :view do
 
       context 'when environment does not exist' do
         it 'shows deployment message' do
-          expected_text = 'This build is creating a deployment to staging'
+          expected_text = 'This job is creating a deployment to staging'
           render
 
           expect(rendered).to have_css(
@@ -161,7 +161,7 @@ describe 'projects/builds/show', :view do
       end
     end
 
-    context 'build that failed to deploy and environment has not been created' do
+    context 'job that failed to deploy and environment has not been created' do
       let(:build) do
         create(:ci_build, :failed, environment: 'staging', pipeline: pipeline)
       end
@@ -171,7 +171,7 @@ describe 'projects/builds/show', :view do
       end
 
       it 'shows deployment message' do
-        expected_text = 'The deployment of this build to staging did not succeed'
+        expected_text = 'The deployment of this job to staging did not succeed'
         render
 
         expect(rendered).to have_css(
@@ -179,7 +179,7 @@ describe 'projects/builds/show', :view do
       end
     end
 
-    context 'build that will deploy and environment has not been created' do
+    context 'job that will deploy and environment has not been created' do
       let(:build) do
         create(:ci_build, :running, environment: 'staging', pipeline: pipeline)
       end
@@ -189,7 +189,7 @@ describe 'projects/builds/show', :view do
       end
 
       it 'shows deployment message' do
-        expected_text = 'This build is creating a deployment to staging'
+        expected_text = 'This job is creating a deployment to staging'
         render
 
         expect(rendered).to have_css(
@@ -200,7 +200,7 @@ describe 'projects/builds/show', :view do
     end
   end
 
-  context 'when build is running' do
+  context 'when job is running' do
     before do
       build.run!
       render
@@ -211,7 +211,7 @@ describe 'projects/builds/show', :view do
     end
   end
 
-  context 'when build is not running' do
+  context 'when job is not running' do
     before do
       build.success!
       render
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index e471a68a49a..5ef8cf1105b 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -107,7 +107,8 @@ describe GitGarbageCollectWorker do
       tree: old_commit.tree,
       parents: [old_commit],
     )
-    project.repository.update_ref!(
+    GitOperationService.new(nil, project.repository).send(
+      :update_ref,
       "refs/heads/#{SecureRandom.hex(6)}",
       new_commit_sha,
       Gitlab::Git::BLANK_SHA
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 984acdade36..5919b99a6ed 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -74,7 +74,7 @@ describe PostReceive do
 
   context "webhook" do
     it "fetches the correct project" do
-      expect(Project).to receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)
+      expect(Project).to receive(:find_by_full_path).with(project.path_with_namespace).and_return(project)
       PostReceive.new.perform(pwd(project), key_id, base64_changes)
     end
 
@@ -89,7 +89,7 @@ describe PostReceive do
     end
 
     it "asks the project to trigger all hooks" do
-      allow(Project).to receive(:find_with_namespace).and_return(project)
+      allow(Project).to receive(:find_by_full_path).and_return(project)
       expect(project).to receive(:execute_hooks).twice
       expect(project).to receive(:execute_services).twice
 
@@ -97,7 +97,7 @@ describe PostReceive do
     end
 
     it "enqueues a UpdateMergeRequestsWorker job" do
-      allow(Project).to receive(:find_with_namespace).and_return(project)
+      allow(Project).to receive(:find_by_full_path).and_return(project)
       expect(UpdateMergeRequestsWorker).to receive(:perform_async).with(project.id, project.owner.id, any_args)
 
       PostReceive.new.perform(pwd(project), key_id, base64_changes)