Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
197ca6ba
Commit
197ca6ba
authored
Jan 02, 2017
by
dimitrieh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed bottom padding from merge manually from CLI because of repositioning award emoji's
parent
313aa339
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml
...unreleased/additional-award-emoji-repositioning-fixes.yml
+4
-0
No files found.
app/views/projects/merge_requests/_show.html.haml
View file @
197ca6ba
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
=
render
"projects/merge_requests/widget/show.html.haml"
=
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
)
-
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
You can also accept this merge request manually using the
=
succeed
'.'
do
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
...
...
changelogs/unreleased/additional-award-emoji-repositioning-fixes.yml
0 → 100644
View file @
197ca6ba
---
title
:
Removed bottom padding from merge manually from CLI because of repositioning award emoji's
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment