diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-03 17:29:13 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-03 17:29:13 +0000 |
| commit | 4d253c356fc509d9bcc60e77a016d40ba66957f8 (patch) | |
| tree | 769b144ecfda7aba8a7f01699025f3909cc28818 | |
| parent | 5136e72c31681e8c443074ed1443db4cb69e8fbe (diff) | |
| parent | 197ca6baaaa1651cc83c90bc21b6579958ddeebc (diff) | |
| download | gitlab-ce-4d253c356fc509d9bcc60e77a016d40ba66957f8.tar.gz | |
Merge branch 'additional-award-emoji-repositioning-fixes' into 'master'
Removed bottom padding from merge manually from CLI because of repositioning award emoji's
See merge request !8398
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 633701c6f40..d9a3220b002 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -42,7 +42,7 @@ = render "projects/merge_requests/widget/show.html.haml" - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user) - .merge-manually.light.prepend-top-default.append-bottom-default + .merge-manually.light.prepend-top-default You can also accept this merge request manually using the = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" diff --git a/changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml b/changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml new file mode 100644 index 00000000000..8d5a94c3aa8 --- /dev/null +++ b/changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml @@ -0,0 +1,4 @@ +--- +title: Removed bottom padding from merge manually from CLI because of repositioning award emoji's +merge_request: +author: |