diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-21 13:09:13 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-21 13:09:13 +0200 |
| commit | eaa935d77b824510a141ab10e9471107c516f902 (patch) | |
| tree | 18ce85e77804913d728ed58bdf4cd02259d03a59 | |
| parent | 70489d08b7e8b4bd0ba566da2ed0e417bef3ed3e (diff) | |
| download | gitlab-ce-fix/gb/fix-build-merge-request-link-to-fork-project.tar.gz | |
Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-project
| -rw-r--r-- | app/serializers/build_details_entity.rb | 3 | ||||
| -rw-r--r-- | spec/serializers/build_details_entity_spec.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 8ad5af1987c..743a08acefe 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -16,7 +16,8 @@ class BuildDetailsEntity < JobEntity end expose :path do |build| - project_merge_request_path(build.project, build.merge_request) + project_merge_request_path(build.merge_request.project, + build.merge_request) end end diff --git a/spec/serializers/build_details_entity_spec.rb b/spec/serializers/build_details_entity_spec.rb index 446a2451956..1332572fffc 100644 --- a/spec/serializers/build_details_entity_spec.rb +++ b/spec/serializers/build_details_entity_spec.rb @@ -81,9 +81,9 @@ describe BuildDetailsEntity do expect(subject[:merge_request][:iid]).to eq merge_request.iid end - it 'has a correct merge request path' do + it 'has a merge request path to a target project' do expect(subject[:merge_request][:path]) - .to include fork_project.full_path + .to include project.full_path end end |