diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-01-01 08:29:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-01-01 08:29:09 +0000 |
| commit | 30a301b8ae4d03a030eda3ec3deac949a2ae78e1 (patch) | |
| tree | 48f68732e630b61944f30536c06d65b1df6d30d5 | |
| parent | 594bcf37af438d972adffc025a2d6c7227581824 (diff) | |
| parent | ef304611ad93f9ce9ff6555109292d94476ad52a (diff) | |
| download | gitlab-ce-30a301b8ae4d03a030eda3ec3deac949a2ae78e1.tar.gz | |
Merge branch 'sh-fix-issue-55822' into 'master'
Fix commit SHA not showing in merge request compare dropdown
Closes #55822
See merge request gitlab-org/gitlab-ce!24084
3 files changed, 17 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue index 8da02ed0b7c..b9b1ee02697 100644 --- a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue +++ b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue @@ -129,7 +129,7 @@ export default { </strong> </div> <div> - <small class="commit-sha"> {{ version.truncated_commit_sha }} </small> + <small class="commit-sha"> {{ version.short_commit_sha }} </small> </div> <div> <small> diff --git a/changelogs/unreleased/sh-fix-issue-55822.yml b/changelogs/unreleased/sh-fix-issue-55822.yml new file mode 100644 index 00000000000..1267b2ace2f --- /dev/null +++ b/changelogs/unreleased/sh-fix-issue-55822.yml @@ -0,0 +1,5 @@ +--- +title: Fix commit SHA not showing in merge request compare dropdown +merge_request: 24084 +author: +type: fixed diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb index f7512294bef..63d8decc2d2 100644 --- a/spec/features/merge_request/user_sees_versions_spec.rb +++ b/spec/features/merge_request/user_sees_versions_spec.rb @@ -64,6 +64,17 @@ describe 'Merge request > User sees versions', :js do end end + it 'shows the commit SHAs for every version in the dropdown' do + page.within '.mr-version-dropdown' do + find('.btn-default').click + + page.within('.dropdown-content') do + shas = merge_request.merge_request_diffs.map { |diff| Commit.truncate_sha(diff.head_commit_sha) } + shas.each { |sha| expect(page).to have_content(sha) } + end + end + end + it 'shows comments that were last relevant at that version' do expect(page).to have_content '5 changed files' |