diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-03-26 00:55:02 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-03-26 00:55:02 +0000 |
| commit | 22f2879b9b304ee72cf17356e1b4071a0a394809 (patch) | |
| tree | b58555777ef252dd3f88dd43a2350491593ddb8a | |
| parent | 61b2f70fdcbc8dce7504c6599f57e2db703cc5ae (diff) | |
| parent | fbf638a49446faae96dad4ad1538a010906f975a (diff) | |
| download | gitlab-ce-22f2879b9b304ee72cf17356e1b4071a0a394809.tar.gz | |
Merge branch 'MaxWinterstein-unify-copy-comit-sha' into 'master'
Unify behaviour of 'Copy commit SHA to clipboard' on job view
Closes #58343
See merge request gitlab-org/gitlab-ce!25829
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/commit_block.vue b/app/assets/javascripts/jobs/components/commit_block.vue index 7076a79dd5d..b651a6e4bfb 100644 --- a/app/assets/javascripts/jobs/components/commit_block.vue +++ b/app/assets/javascripts/jobs/components/commit_block.vue @@ -39,7 +39,7 @@ export default { </gl-link> <clipboard-button - :text="commit.short_id" + :text="commit.id" :title="__('Copy commit SHA to clipboard')" css-class="btn btn-clipboard btn-transparent" /> diff --git a/changelogs/unreleased/MaxWinterstein-master-patch-23232.yml b/changelogs/unreleased/MaxWinterstein-master-patch-23232.yml new file mode 100644 index 00000000000..8fb9f1057fe --- /dev/null +++ b/changelogs/unreleased/MaxWinterstein-master-patch-23232.yml @@ -0,0 +1,5 @@ +--- +title: Unify behaviour of 'Copy commit SHA to clipboard' to use full commit SHA. +merge_request: 25829 +author: Max Winterstein +type: changed diff --git a/spec/javascripts/jobs/components/commit_block_spec.js b/spec/javascripts/jobs/components/commit_block_spec.js index 98eba3ac976..c02f564d01a 100644 --- a/spec/javascripts/jobs/components/commit_block_spec.js +++ b/spec/javascripts/jobs/components/commit_block_spec.js @@ -9,6 +9,7 @@ describe('Commit block', () => { const props = { commit: { short_id: '1f0fb84f', + id: '1f0fb84fb6770d74d97eee58118fd3909cd4f48c', commit_path: 'commit/1f0fb84fb6770d74d97eee58118fd3909cd4f48c', title: 'Update README.md', }, @@ -42,7 +43,7 @@ describe('Commit block', () => { it('renders clipboard button', () => { expect(vm.$el.querySelector('button').getAttribute('data-clipboard-text')).toEqual( - props.commit.short_id, + props.commit.id, ); }); }); |