diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-04 12:57:08 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-04 12:57:08 +0300 |
| commit | f3b3ee78df2331aff6e2428476f1f5af36334cb4 (patch) | |
| tree | 49b5355ecf806b84972a5436629f2fd5058be73c | |
| parent | 0e1fc6e04c96ce989062e02d9e706031cea87c36 (diff) | |
| parent | 81bff65fa8342b4e5d995825b1bb3266ff71d6ce (diff) | |
Merge branch '52191-add-mr-reference' into 'master'
Adds MR reference in job sidebar
Closes #52191
See merge request gitlab-org/gitlab-ce!22103
| -rw-r--r-- | app/assets/javascripts/jobs/components/commit_block.vue | 2 | ||||
| -rw-r--r-- | spec/javascripts/jobs/components/commit_block_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/commit_block.vue b/app/assets/javascripts/jobs/components/commit_block.vue index 39a4ff159e2..4b1788a1c16 100644 --- a/app/assets/javascripts/jobs/components/commit_block.vue +++ b/app/assets/javascripts/jobs/components/commit_block.vue @@ -46,7 +46,7 @@ v-if="mergeRequest" :href="mergeRequest.path" class="js-link-commit link-commit" - >{{ mergeRequest.iid }}</a> + >!{{ mergeRequest.iid }}</a> </p> <p class="build-light-text append-bottom-0"> diff --git a/spec/javascripts/jobs/components/commit_block_spec.js b/spec/javascripts/jobs/components/commit_block_spec.js index 61ee993f46a..0bcc4ff940f 100644 --- a/spec/javascripts/jobs/components/commit_block_spec.js +++ b/spec/javascripts/jobs/components/commit_block_spec.js @@ -56,7 +56,7 @@ describe('Commit block', () => { props.mergeRequest.path, ); expect(vm.$el.querySelector('.js-link-commit').textContent.trim()).toEqual( - props.mergeRequest.iid, + `!${props.mergeRequest.iid}`, ); }); }); |