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
22ec3fa1
Commit
22ec3fa1
authored
Dec 31, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR css for accept MR block
parent
e5ff5c28
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-0
app/views/merge_requests/show/_mr_accept.html.haml
app/views/merge_requests/show/_mr_accept.html.haml
+6
-6
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
22ec3fa1
...
...
@@ -47,6 +47,7 @@
}
label
{
color
:
#444
;
text-align
:
left
}
}
...
...
app/views/merge_requests/show/_mr_accept.html.haml
View file @
22ec3fa1
...
...
@@ -9,19 +9,19 @@
%span
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :get
do
|
f
|
%p
You can accept this request automatically.
If you still want to do it manually -
You can accept this request automatically.
If you still want to do it manually -
%strong
=
link_to
"click here"
,
"#"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
for instructions
.accept_group
=
f
.
submit
"Accept Merge Request"
,
class:
"btn s
mall s
uccess accept_merge_request"
-
unless
@project
.
root_ref?
@merge_request
.
source_branch
=
f
.
submit
"Accept Merge Request"
,
class:
"btn success accept_merge_request"
-
unless
@project
.
root_ref?
@merge_request
.
source_branch
.remove_branch_holder
=
label_tag
:should_remove_source_branch
,
class:
"checkbox"
do
=
label_tag
:should_remove_source_branch
,
class:
"checkbox"
do
=
check_box_tag
:should_remove_source_branch
Remove source-branch
.clearfix
.automerge_widget.cannot_be_merged
{
style:
"display:none"
}
.alert.alert-info
...
...
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