Merge branch 'master' into bootstrap4

16 files changed, 372 insertions, 63 deletions

diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 19995559fae..25a57f7d379 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -27,7 +27,7 @@ describe 'Merge request > User resolves conflicts', :js do
         end
       end
 
-      find_button('Commit conflict resolution').send_keys(:return)
+      find_button('Commit to source branch').send_keys(:return)
 
       expect(page).to have_content('All merge conflicts were resolved')
       merge_request.reload_diff
@@ -71,7 +71,7 @@ describe 'Merge request > User resolves conflicts', :js do
         execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");')
       end
 
-      find_button('Commit conflict resolution').send_keys(:return)
+      find_button('Commit to source branch').send_keys(:return)
 
       expect(page).to have_content('All merge conflicts were resolved')
       merge_request.reload_diff
@@ -145,7 +145,7 @@ describe 'Merge request > User resolves conflicts', :js do
           execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");')
         end
 
-        click_button 'Commit conflict resolution'
+        click_button 'Commit to source branch'
 
         expect(page).to have_content('All merge conflicts were resolved')
 
diff --git a/spec/features/projects/actve_tabs_spec.rb b/spec/features/projects/actve_tabs_spec.rb
index 0bda68b83e7..ce5606b63ae 100644
--- a/spec/features/projects/actve_tabs_spec.rb
+++ b/spec/features/projects/actve_tabs_spec.rb
@@ -35,7 +35,7 @@ describe 'Project active tab' do
       visit project_path(project)
     end
 
-    it_behaves_like 'page has active tab', 'Overview'
+    it_behaves_like 'page has active tab', 'Project'
     it_behaves_like 'page has active sub tab', 'Details'
 
     context 'on project Home/Activity' do
@@ -43,7 +43,7 @@ describe 'Project active tab' do
         click_tab('Activity')
       end
 
-      it_behaves_like 'page has active tab', 'Overview'
+      it_behaves_like 'page has active tab', 'Project'
       it_behaves_like 'page has active sub tab', 'Activity'
     end
   end
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index ac82f869f0f..e7b305925f7 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -14,6 +14,8 @@ feature 'File blob', :js do
   context 'Ruby file' do
     before do
       visit_blob('files/ruby/popen.rb')
+
+      wait_for_requests
     end
 
     it 'displays the blob' do
@@ -48,6 +50,8 @@ feature 'File blob', :js do
     context 'visiting directly' do
       before do
         visit_blob('files/markdown/ruby-style-guide.md')
+
+        wait_for_requests
       end
 
       it 'displays the blob using the rich viewer' do
@@ -159,6 +163,8 @@ feature 'File blob', :js do
         project.update_attribute(:lfs_enabled, true)
 
         visit_blob('files/lfs/file.md')
+
+        wait_for_requests
       end
 
       it 'displays an error' do
@@ -207,6 +213,8 @@ feature 'File blob', :js do
     context 'when LFS is disabled on the project' do
       before do
         visit_blob('files/lfs/file.md')
+
+        wait_for_requests
       end
 
       it 'displays the blob' do
@@ -242,6 +250,8 @@ feature 'File blob', :js do
       ).execute
 
       visit_blob('files/test.pdf')
+
+      wait_for_requests
     end
 
     it 'displays the blob' do
@@ -268,6 +278,8 @@ feature 'File blob', :js do
         project.update_attribute(:lfs_enabled, true)
 
         visit_blob('files/lfs/lfs_object.iso')
+
+        wait_for_requests
       end
 
       it 'displays the blob' do
@@ -290,6 +302,8 @@ feature 'File blob', :js do
     context 'when LFS is disabled on the project' do
       before do
         visit_blob('files/lfs/lfs_object.iso')
+
+        wait_for_requests
       end
 
       it 'displays the blob' do
@@ -313,6 +327,8 @@ feature 'File blob', :js do
   context 'ZIP file' do
     before do
       visit_blob('Gemfile.zip')
+
+      wait_for_requests
     end
 
     it 'displays the blob' do
@@ -347,6 +363,8 @@ feature 'File blob', :js do
       ).execute
 
       visit_blob('files/empty.md')
+
+      wait_for_requests
     end
 
     it 'displays an error' do
diff --git a/spec/features/projects/user_sees_sidebar_spec.rb b/spec/features/projects/user_sees_sidebar_spec.rb
index cf80517b934..8a9255db9e8 100644
--- a/spec/features/projects/user_sees_sidebar_spec.rb
+++ b/spec/features/projects/user_sees_sidebar_spec.rb
@@ -37,7 +37,7 @@ describe 'Projects > User sees sidebar' do
       visit project_path(project)
 
       within('.nav-sidebar') do
-        expect(page).to have_content 'Overview'
+        expect(page).to have_content 'Project'
         expect(page).to have_content 'Issues'
         expect(page).to have_content 'Wiki'
 
diff --git a/spec/fixtures/api/schemas/public_api/v4/projects.json b/spec/fixtures/api/schemas/public_api/v4/projects.json
index d89eeea89a5..17ad8d8c48d 100644
--- a/spec/fixtures/api/schemas/public_api/v4/projects.json
+++ b/spec/fixtures/api/schemas/public_api/v4/projects.json
@@ -20,6 +20,7 @@
       "ssh_url_to_repo": { "type": "string" },
       "http_url_to_repo": { "type": "string" },
       "web_url": { "type": "string" },
+      "readme_url": { "type": ["string", "null"] },
       "avatar_url": { "type": ["string", "null"] },
       "star_count": { "type": "integer" },
       "forks_count": { "type": "integer" },
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
index db27aa144d6..00f4f2d7c39 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
@@ -1,12 +1,12 @@
 import Vue from 'vue';
-import authorComponent from '~/vue_merge_request_widget/components/mr_widget_author.vue';
+import MrWidgetAuthor from '~/vue_merge_request_widget/components/mr_widget_author.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
-describe('MRWidgetAuthor', () => {
+describe('MrWidgetAuthor', () => {
   let vm;
 
   beforeEach(() => {
-    const Component = Vue.extend(authorComponent);
+    const Component = Vue.extend(MrWidgetAuthor);
 
     vm = mountComponent(Component, {
       author: {
diff --git a/spec/lib/api/helpers/pagination_spec.rb b/spec/lib/api/helpers/pagination_spec.rb
index a547988d631..c73c6023b60 100644
--- a/spec/lib/api/helpers/pagination_spec.rb
+++ b/spec/lib/api/helpers/pagination_spec.rb
@@ -7,7 +7,203 @@ describe API::Helpers::Pagination do
     Class.new.include(described_class).new
   end
 
-  describe '#paginate' do
+  describe '#paginate (keyset pagination)' do
+    let(:value) { spy('return value') }
+
+    before do
+      allow(value).to receive(:to_query).and_return(value)
+
+      allow(subject).to receive(:header).and_return(value)
+      allow(subject).to receive(:params).and_return(value)
+      allow(subject).to receive(:request).and_return(value)
+    end
+
+    context 'when resource can be paginated' do
+      let!(:projects) do
+        [
+          create(:project, name: 'One'),
+          create(:project, name: 'Two'),
+          create(:project, name: 'Three')
+        ].sort_by { |e| -e.id } # sort by id desc (this is the default sort order for the API)
+      end
+
+      describe 'first page' do
+        before do
+          allow(subject).to receive(:params)
+            .and_return({ pagination: 'keyset', per_page: 2 })
+        end
+
+        it 'returns appropriate amount of resources' do
+          expect(subject.paginate(resource).count).to eq 2
+        end
+
+        it 'returns the first two records (by id desc)' do
+          expect(subject.paginate(resource)).to eq(projects[0..1])
+        end
+
+        it 'adds appropriate headers' do
+          expect_header('X-Per-Page', '2')
+          expect_header('X-Next-Page', "#{value}?ks_prev_id=#{projects[1].id}&pagination=keyset&per_page=2")
+
+          expect_header('Link', anything) do |_key, val|
+            expect(val).to include('rel="next"')
+          end
+
+          subject.paginate(resource)
+        end
+      end
+
+      describe 'second page' do
+        before do
+          allow(subject).to receive(:params)
+            .and_return({ pagination: 'keyset', per_page: 2, ks_prev_id: projects[1].id })
+        end
+
+        it 'returns appropriate amount of resources' do
+          expect(subject.paginate(resource).count).to eq 1
+        end
+
+        it 'returns the third record' do
+          expect(subject.paginate(resource)).to eq(projects[2..2])
+        end
+
+        it 'adds appropriate headers' do
+          expect_header('X-Per-Page', '2')
+          expect_header('X-Next-Page', "#{value}?ks_prev_id=#{projects[2].id}&pagination=keyset&per_page=2")
+
+          expect_header('Link', anything) do |_key, val|
+            expect(val).to include('rel="next"')
+          end
+
+          subject.paginate(resource)
+        end
+      end
+
+      describe 'third page' do
+        before do
+          allow(subject).to receive(:params)
+            .and_return({ pagination: 'keyset', per_page: 2, ks_prev_id: projects[2].id })
+        end
+
+        it 'returns appropriate amount of resources' do
+          expect(subject.paginate(resource).count).to eq 0
+        end
+
+        it 'adds appropriate headers' do
+          expect_header('X-Per-Page', '2')
+          expect(subject).not_to receive(:header).with('Link')
+
+          subject.paginate(resource)
+        end
+      end
+
+      context 'if order' do
+        context 'is not present' do
+          before do
+            allow(subject).to receive(:params)
+              .and_return({ pagination: 'keyset', per_page: 2 })
+          end
+
+          it 'is not present it adds default order(:id) desc' do
+            resource.order_values = []
+
+            paginated_relation = subject.paginate(resource)
+
+            expect(resource.order_values).to be_empty
+            expect(paginated_relation.order_values).to be_present
+            expect(paginated_relation.order_values.size).to eq(1)
+            expect(paginated_relation.order_values.first).to be_descending
+            expect(paginated_relation.order_values.first.expr.name).to eq :id
+          end
+        end
+
+        context 'is present' do
+          let(:resource) { Project.all.order(name: :desc) }
+          let!(:projects) do
+            [
+              create(:project, name: 'One'),
+              create(:project, name: 'Two'),
+              create(:project, name: 'Three'),
+              create(:project, name: 'Three'), # Note the duplicate name
+              create(:project, name: 'Four'),
+              create(:project, name: 'Five'),
+              create(:project, name: 'Six')
+            ]
+
+            # if we sort this by name descending, id descending, this yields:
+            # {
+            #   2 => "Two",
+            #   4 => "Three",
+            #   3 => "Three",
+            #   7 => "Six",
+            #   1 => "One",
+            #   5 => "Four",
+            #   6 => "Five"
+            # }
+            #
+            # (key is the id)
+          end
+
+          it 'it also orders by primary key' do
+            allow(subject).to receive(:params)
+              .and_return({ pagination: 'keyset', per_page: 2 })
+            paginated_relation = subject.paginate(resource)
+
+            expect(paginated_relation.order_values).to be_present
+            expect(paginated_relation.order_values.size).to eq(2)
+            expect(paginated_relation.order_values.first).to be_descending
+            expect(paginated_relation.order_values.first.expr.name).to eq :name
+            expect(paginated_relation.order_values.second).to be_descending
+            expect(paginated_relation.order_values.second.expr.name).to eq :id
+          end
+
+          it 'it returns the right records (first page)' do
+            allow(subject).to receive(:params)
+              .and_return({ pagination: 'keyset', per_page: 2 })
+            result = subject.paginate(resource)
+
+            expect(result.first).to eq(projects[1])
+            expect(result.second).to eq(projects[3])
+          end
+
+          it 'it returns the right records (second page)' do
+            allow(subject).to receive(:params)
+              .and_return({ pagination: 'keyset', ks_prev_id: projects[3].id, ks_prev_name: projects[3].name, per_page: 2 })
+            result = subject.paginate(resource)
+
+            expect(result.first).to eq(projects[2])
+            expect(result.second).to eq(projects[6])
+          end
+
+          it 'it returns the right records (third page), note increased per_page' do
+            allow(subject).to receive(:params)
+              .and_return({ pagination: 'keyset', ks_prev_id: projects[6].id, ks_prev_name: projects[6].name, per_page: 5 })
+            result = subject.paginate(resource)
+
+            expect(result.size).to eq(3)
+            expect(result.first).to eq(projects[0])
+            expect(result.second).to eq(projects[4])
+            expect(result.last).to eq(projects[5])
+          end
+
+          it 'it returns the right link to the next page' do
+            allow(subject).to receive(:params)
+              .and_return({ pagination: 'keyset', ks_prev_id: projects[3].id, ks_prev_name: projects[3].name, per_page: 2 })
+            expect_header('X-Per-Page', '2')
+            expect_header('X-Next-Page', "#{value}?ks_prev_id=#{projects[6].id}&ks_prev_name=#{projects[6].name}&pagination=keyset&per_page=2")
+
+            expect_header('Link', anything) do |_key, val|
+              expect(val).to include('rel="next"')
+            end
+
+            subject.paginate(resource)
+          end
+        end
+      end
+    end
+  end
+
+  describe '#paginate (default offset-based pagination)' do
     let(:value) { spy('return value') }
 
     before do
@@ -146,14 +342,14 @@ describe API::Helpers::Pagination do
         end
       end
     end
+  end
 
-    def expect_header(*args, &block)
-      expect(subject).to receive(:header).with(*args, &block)
-    end
+  def expect_header(*args, &block)
+    expect(subject).to receive(:header).with(*args, &block)
+  end
 
-    def expect_message(method)
-      expect(subject).to receive(method)
-        .at_least(:once).and_return(value)
-    end
+  def expect_message(method)
+    expect(subject).to receive(method)
+      .at_least(:once).and_return(value)
   end
 end
diff --git a/spec/lib/api/helpers/related_resources_helpers_spec.rb b/spec/lib/api/helpers/related_resources_helpers_spec.rb
index b918301f1cb..66af7f81535 100644
--- a/spec/lib/api/helpers/related_resources_helpers_spec.rb
+++ b/spec/lib/api/helpers/related_resources_helpers_spec.rb
@@ -9,9 +9,9 @@ describe API::Helpers::RelatedResourcesHelpers do
     let(:path) { '/api/v4/awesome_endpoint' }
     subject(:url) { helpers.expose_url(path) }
 
-    def stub_default_url_options(protocol: 'http', host: 'example.com', port: nil)
+    def stub_default_url_options(protocol: 'http', host: 'example.com', port: nil, script_name: '')
       expect(Gitlab::Application.routes).to receive(:default_url_options)
-        .and_return(protocol: protocol, host: host, port: port)
+        .and_return(protocol: protocol, host: host, port: port, script_name: script_name)
     end
 
     it 'respects the protocol if it is HTTP' do
@@ -37,5 +37,17 @@ describe API::Helpers::RelatedResourcesHelpers do
 
       is_expected.to start_with('http://example.com:8080/')
     end
+
+    it 'includes the relative_url before the path if it is set' do
+      stub_default_url_options(script_name: '/gitlab')
+
+      is_expected.to start_with('http://example.com/gitlab/api/v4')
+    end
+
+    it 'includes the path after the host' do
+      stub_default_url_options
+
+      is_expected.to start_with('http://example.com/api/v4')
+    end
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 39625b559eb..af2240f4f89 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -469,6 +469,34 @@ describe Project do
     end
   end
 
+  describe "#readme_url" do
+    let(:project) { create(:project, :repository, path: "somewhere") }
+
+    context 'with a non-existing repository' do
+      it 'returns nil' do
+        allow(project.repository).to receive(:tree).with(:head).and_return(nil)
+
+        expect(project.readme_url).to be_nil
+      end
+    end
+
+    context 'with an existing repository' do
+      context 'when no README exists' do
+        it 'returns nil' do
+          allow_any_instance_of(Tree).to receive(:readme).and_return(nil)
+
+          expect(project.readme_url).to be_nil
+        end
+      end
+
+      context 'when a README exists' do
+        it 'returns the README' do
+          expect(project.readme_url).to eql("#{Gitlab.config.gitlab.url}/#{project.namespace.full_path}/somewhere/blob/master/README.md")
+        end
+      end
+    end
+  end
+
   describe "#new_issuable_address" do
     let(:project) { create(:project, path: "somewhere") }
     let(:user) { create(:user) }
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 6bc148a1392..0ccf55bd895 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -2031,27 +2031,27 @@ describe Repository do
 
   describe '#xcode_project?' do
     before do
-      allow(repository).to receive(:tree).with(:head).and_return(double(:tree, blobs: [blob]))
+      allow(repository).to receive(:tree).with(:head).and_return(double(:tree, trees: [tree]))
     end
 
-    context 'when the root contains a *.xcodeproj file' do
-      let(:blob) { double(:blob, path: 'Foo.xcodeproj') }
+    context 'when the root contains a *.xcodeproj directory' do
+      let(:tree) { double(:tree, path: 'Foo.xcodeproj') }
 
       it 'returns true' do
         expect(repository.xcode_project?).to be_truthy
       end
     end
 
-    context 'when the root contains a *.xcworkspace file' do
-      let(:blob) { double(:blob, path: 'Foo.xcworkspace') }
+    context 'when the root contains a *.xcworkspace directory' do
+      let(:tree) { double(:tree, path: 'Foo.xcworkspace') }
 
       it 'returns true' do
         expect(repository.xcode_project?).to be_truthy
       end
     end
 
-    context 'when the root contains no XCode config file' do
-      let(:blob) { double(:blob, path: 'subdir/Foo.xcworkspace') }
+    context 'when the root contains no Xcode config directory' do
+      let(:tree) { double(:tree, path: 'Foo') }
 
       it 'returns false' do
         expect(repository.xcode_project?).to be_falsey
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 684fa030baf..6a2f4a39f09 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -393,24 +393,6 @@ describe User do
   end
 
   describe 'after commit hook' do
-    describe '.update_invalid_gpg_signatures' do
-      let(:user) do
-        create(:user, email: 'tula.torphy@abshire.ca').tap do |user|
-          user.skip_reconfirmation!
-        end
-      end
-
-      it 'does nothing when the name is updated' do
-        expect(user).not_to receive(:update_invalid_gpg_signatures)
-        user.update_attributes!(name: 'Bette')
-      end
-
-      it 'synchronizes the gpg keys when the email is updated' do
-        expect(user).to receive(:update_invalid_gpg_signatures).at_most(:twice)
-        user.update_attributes!(email: 'shawnee.ritchie@denesik.com')
-      end
-    end
-
     describe '#update_emails_with_primary_email' do
       before do
         @user = create(:user, email: 'primary@example.com').tap do |user|
@@ -450,6 +432,76 @@ describe User do
         expect(@user.emails.first.confirmed_at).not_to eq nil
       end
     end
+
+    describe '#update_notification_email' do
+      # Regression: https://gitlab.com/gitlab-org/gitlab-ce/issues/22846
+      context 'when changing :email' do
+        let(:user) { create(:user) }
+        let(:new_email) { 'new-email@example.com' }
+
+        it 'sets :unconfirmed_email' do
+          expect do
+            user.tap { |u| u.update!(email: new_email) }.reload
+          end.to change(user, :unconfirmed_email).to(new_email)
+        end
+
+        it 'does not change :notification_email' do
+          expect do
+            user.tap { |u| u.update!(email: new_email) }.reload
+          end.not_to change(user, :notification_email)
+        end
+
+        it 'updates :notification_email to the new email once confirmed' do
+          user.update!(email: new_email)
+
+          expect do
+            user.tap(&:confirm).reload
+          end.to change(user, :notification_email).to eq(new_email)
+        end
+
+        context 'and :notification_email is set to a secondary email' do
+          let!(:email_attrs) { attributes_for(:email, :confirmed, user: user) }
+          let(:secondary) { create(:email, :confirmed, email: 'secondary@example.com', user: user) }
+
+          before do
+            user.emails.create(email_attrs)
+            user.tap { |u| u.update!(notification_email: email_attrs[:email]) }.reload
+          end
+
+          it 'does not change :notification_email to :email' do
+            expect do
+              user.tap { |u| u.update!(email: new_email) }.reload
+            end.not_to change(user, :notification_email)
+          end
+
+          it 'does not change :notification_email to :email once confirmed' do
+            user.update!(email: new_email)
+
+            expect do
+              user.tap(&:confirm).reload
+            end.not_to change(user, :notification_email)
+          end
+        end
+      end
+    end
+
+    describe '#update_invalid_gpg_signatures' do
+      let(:user) do
+        create(:user, email: 'tula.torphy@abshire.ca').tap do |user|
+          user.skip_reconfirmation!
+        end
+      end
+
+      it 'does nothing when the name is updated' do
+        expect(user).not_to receive(:update_invalid_gpg_signatures)
+        user.update_attributes!(name: 'Bette')
+      end
+
+      it 'synchronizes the gpg keys when the email is updated' do
+        expect(user).to receive(:update_invalid_gpg_signatures).at_most(:twice)
+        user.update_attributes!(email: 'shawnee.ritchie@denesik.com')
+      end
+    end
   end
 
   describe '#update_tracked_fields!', :clean_gitlab_redis_shared_state do
diff --git a/spec/requests/api/environments_spec.rb b/spec/requests/api/environments_spec.rb
index 53d48a91007..fdddca5d0ef 100644
--- a/spec/requests/api/environments_spec.rb
+++ b/spec/requests/api/environments_spec.rb
@@ -15,7 +15,7 @@ describe API::Environments do
       it 'returns project environments' do
         project_data_keys = %w(
           id description default_branch tag_list
-          ssh_url_to_repo http_url_to_repo web_url
+          ssh_url_to_repo http_url_to_repo web_url readme_url
           name name_with_namespace
           path path_with_namespace
           star_count forks_count
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 85a571b8f0e..9b7c3205c1f 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -18,7 +18,7 @@ describe API::Projects do
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
   let(:admin) { create(:admin) }
-  let(:project) { create(:project, namespace: user.namespace) }
+  let(:project) { create(:project, :repository, namespace: user.namespace) }
   let(:project2) { create(:project, namespace: user.namespace) }
   let(:snippet) { create(:project_snippet, :public, author: user, project: project, title: 'example') }
   let(:project_member) { create(:project_member, :developer, user: user3, project: project) }
@@ -220,7 +220,7 @@ describe API::Projects do
         it 'returns a simplified version of all the projects' do
           expected_keys = %w(
             id description default_branch tag_list
-            ssh_url_to_repo http_url_to_repo web_url
+            ssh_url_to_repo http_url_to_repo web_url readme_url
             name name_with_namespace
             path path_with_namespace
             star_count forks_count
@@ -854,6 +854,7 @@ describe API::Projects do
         expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds)
         expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to eq(project.only_allow_merge_if_all_discussions_are_resolved)
         expect(json_response['merge_method']).to eq(project.merge_method.to_s)
+        expect(json_response['readme_url']).to eq(project.readme_url)
       end
 
       it 'returns a project by path name' do
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index e8196980a8c..05637eb0729 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -488,10 +488,6 @@ describe API::Users do
   describe "PUT /users/:id" do
     let!(:admin_user) { create(:admin) }
 
-    before do
-      admin
-    end
-
     it "updates user with new bio" do
       put api("/users/#{user.id}", admin), { bio: 'new test bio' }
 
@@ -525,27 +521,28 @@ describe API::Users do
       expect(json_response['avatar_url']).to include(user.avatar_path)
     end
 
-    it 'updates user with his own email' do
-      put api("/users/#{user.id}", admin), email: user.email
-
-      expect(response).to have_gitlab_http_status(200)
-      expect(json_response['email']).to eq(user.email)
-      expect(user.reload.email).to eq(user.email)
-    end
-
     it 'updates user with a new email' do
+      old_email = user.email
+      old_notification_email = user.notification_email
       put api("/users/#{user.id}", admin), email: 'new@email.com'
 
+      user.reload
+
       expect(response).to have_gitlab_http_status(200)
-      expect(user.reload.notification_email).to eq('new@email.com')
+      expect(user).to be_confirmed
+      expect(user.email).to eq(old_email)
+      expect(user.notification_email).to eq(old_notification_email)
+      expect(user.unconfirmed_email).to eq('new@email.com')
     end
 
     it 'skips reconfirmation when requested' do
-      put api("/users/#{user.id}", admin), { skip_reconfirmation: true }
+      put api("/users/#{user.id}", admin), email: 'new@email.com', skip_reconfirmation: true
 
       user.reload
 
-      expect(user.confirmed_at).to be_present
+      expect(response).to have_gitlab_http_status(200)
+      expect(user).to be_confirmed
+      expect(user.email).to eq('new@email.com')
     end
 
     it 'updates user with his own username' do
diff --git a/spec/requests/api/v3/projects_spec.rb b/spec/requests/api/v3/projects_spec.rb
index 4c25bd935c6..158ddf171bc 100644
--- a/spec/requests/api/v3/projects_spec.rb
+++ b/spec/requests/api/v3/projects_spec.rb
@@ -82,7 +82,7 @@ describe API::V3::Projects do
         it 'returns a simplified version of all the projects' do
           expected_keys = %w(
             id description default_branch tag_list
-            ssh_url_to_repo http_url_to_repo web_url
+            ssh_url_to_repo http_url_to_repo web_url readme_url
             name name_with_namespace
             path path_with_namespace
             star_count forks_count
diff --git a/spec/support/helpers/rake_helpers.rb b/spec/support/helpers/rake_helpers.rb
index 86bfeed107c..acd9cce6a67 100644
--- a/spec/support/helpers/rake_helpers.rb
+++ b/spec/support/helpers/rake_helpers.rb
@@ -13,6 +13,10 @@ module RakeHelpers
     allow(main_object).to receive(:print)
   end
 
+  def silence_progress_bar
+    allow_any_instance_of(ProgressBar::Output).to receive(:stream).and_return(double().as_null_object)
+  end
+
   def main_object
     @main_object ||= TOPLEVEL_BINDING.eval('self')
   end