diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 00:07:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 00:07:37 +0300 |
commit | 7f8330873c1a5860b8a9a52d111083a65d210249 (patch) | |
tree | e6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/serializers/merge_request_widget_entity_spec.rb | |
parent | bbe243060399191abcba33c7ebd611f6ec34c6cd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers/merge_request_widget_entity_spec.rb')
-rw-r--r-- | spec/serializers/merge_request_widget_entity_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb index 80f59ef90ca..22232682be1 100644 --- a/spec/serializers/merge_request_widget_entity_spec.rb +++ b/spec/serializers/merge_request_widget_entity_spec.rb @@ -45,12 +45,12 @@ describe MergeRequestWidgetEntity do it 'has email_patches_path' do expect(subject[:email_patches_path]) - .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}.patch") + .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}.patch") end it 'has plain_diff_path' do expect(subject[:plain_diff_path]) - .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}.diff") + .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}.diff") end describe 'when source project is deleted' do |