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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
92cb7874
Commit
92cb7874
authored
Jan 06, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better cannot-be-merged widget for MR
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
d187ffeb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+5
-3
No files found.
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
92cb7874
...
...
@@ -31,10 +31,12 @@
.automerge_widget.cannot_be_merged.hide
.bs-callout.bs-callout-disabled
%h4
This request can't be merged with GitLab.
%span
=
link_to
"Show how to merge"
,
"#modal_merge_info"
,
class:
"how_to_merge_link btn padded"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
%strong
This request can't be merged with GitLab. You should do it manually
You should do it manually with
%strong
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
.automerge_widget.unchecked
.bs-callout.bs-callout-warning
...
...
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