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
b40809d7
Commit
b40809d7
authored
Jan 28, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UX for widget if merge request can not be merged
parent
965cec68
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-0
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+9
-2
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
b40809d7
...
@@ -122,6 +122,7 @@
...
@@ -122,6 +122,7 @@
background
:
$box_bg
;
background
:
$box_bg
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
color
:
#666
;
color
:
#666
;
border
:
1px
solid
#EEE
;
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
@include
box-shadow
(
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.09
));
.ci_widget
{
.ci_widget
{
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
b40809d7
...
@@ -45,10 +45,17 @@
...
@@ -45,10 +45,17 @@
.automerge_widget.cannot_be_merged.hide
.automerge_widget.cannot_be_merged.hide
%h4
%h4
This request can't be merged with GitLab.
This request can't be merged with GitLab.
%p
You should do it manually with
You should do it manually with
%strong
%strong
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"#modal_merge_info"
,
class:
"underlined-link how_to_merge_link"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
do
command line
%p
%button
.btn.disabled
%i
.fa.fa-warning
Accept Merge Request
This usually happens when git can not resolve conflicts between branches automatically.
.automerge_widget.unchecked
.automerge_widget.unchecked
%p
%p
...
...
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