Add latest changes from gitlab-org/gitlab@master

spec/services/issues/close_service_spec.rb

@@ -103,8 +103,8 @@ describe Issues::CloseService do
         subject { described_class.new(project, user).close_issue(issue, closed_via: closing_merge_request) }
         context 'when `metrics.first_mentioned_in_commit_at` is not set' do
-          it 'uses the first commit timestamp' do
-            expected = closing_merge_request.commits.first.date
+          it 'uses the first commit authored timestamp' do
+            expected = closing_merge_request.commits.first.authored_date
             subject

spec/services/merge_requests/merge_service_spec.rb

@@ -118,7 +118,7 @@ describe MergeRequests::MergeService do
       it 'closes GitLab issue tracker issues' do
         issue  = create :issue, project: project
-        commit = double('commit', safe_message: "Fixes #{issue.to_reference}", date: Time.now)
+        commit = instance_double('commit', safe_message: "Fixes #{issue.to_reference}", date: Time.now, authored_date: Time.now)
         allow(merge_request).to receive(:commits).and_return([commit])
         merge_request.cache_merge_request_closes_issues!

spec/support/helpers/project_forks_helper.rb

@@ -59,7 +59,7 @@ module ProjectForksHelper
         bare_repo: TestEnv.forked_repo_path_bare,
         refs: TestEnv::FORKED_BRANCH_SHA
       )
-      forked_project.repository.after_import
+      forked_project.repository.expire_content_cache
       forked_project
     end