diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-31 07:40:55 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-31 07:40:55 +0000 |
| commit | 5116d11a6192e469ba09103507b1e0cb8d777326 (patch) | |
| tree | 5252b1a8f43014fc2d5583ec85dc508d138e4004 | |
| parent | 86550fa1be32e18b526d22fa4d15b8af26a1e978 (diff) | |
| parent | 25cc1dde9d02a171c7ab645500e98a7a47dea93f (diff) | |
| download | gitlab-ce-5116d11a6192e469ba09103507b1e0cb8d777326.tar.gz | |
Merge branch '46971-extra-whitespace' into 'master'
Resolve "Extra whitespace when hovering commit sha in MR widget"
Closes #46971
See merge request gitlab-org/gitlab-ce!19267
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue index 8c7e0664559..eb581b807a2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue @@ -168,8 +168,8 @@ <a :href="mr.mergeCommitPath" class="commit-sha js-mr-merged-commit-sha" + v-text="mr.shortMergeCommitSha" > - {{ mr.shortMergeCommitSha }} </a> <clipboard-button :title="__('Copy commit SHA to clipboard')" |