diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 15:09:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 15:09:07 +0300 |
| commit | 2a040e2655fe0a99df61ad0a7bd0c27e68af0c38 (patch) | |
| tree | a245cd0d6dd10f185e2fd098e371adc1ea03b72b /spec/services/merge_requests | |
| parent | a53d2c37c4934f564caa94543dd4cf5af1703e2d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 496b08799f2..6cc042e9a97 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/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}") + commit = double('commit', safe_message: "Fixes #{issue.to_reference}", date: Time.now) allow(merge_request).to receive(:commits).and_return([commit]) merge_request.cache_merge_request_closes_issues! |