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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6e217bd5
Commit
6e217bd5
authored
Dec 30, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve accept mr widget UI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
c9572857
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
22 deletions
+36
-22
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+20
-3
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+16
-19
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
6e217bd5
...
@@ -11,10 +11,27 @@
...
@@ -11,10 +11,27 @@
}
}
}
}
.accept-group
{
.accept-merge-holder
{
label
{
margin-top
:
5px
;
margin
:
5px
;
.accept-action
{
display
:
inline-block
;
.accept_merge_request
{
padding
:
10px
20px
;
}
}
.accept-control
{
display
:
inline-block
;
margin-left
:
20px
;
margin-left
:
20px
;
padding
:
10px
0
;
line-height
:
20px
;
font-weight
:
bold
;
.checkbox
{
margin
:
0
;
}
}
}
}
}
}
}
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
6e217bd5
...
@@ -13,25 +13,22 @@
...
@@ -13,25 +13,22 @@
.automerge_widget.can_be_merged.hide
.automerge_widget.can_be_merged.hide
.clearfix
.clearfix
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :post
do
|
f
|
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :post
do
|
f
|
%h4
.accept-merge-holder.clearfix.js-toggle-container
You can accept this request automatically.
.accept-action
.accept-merge-holder.clearfix
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
.accept-group
-
if
can_remove_branch?
(
@merge_request
.
source_project
,
@merge_request
.
source_branch
)
&&
!
@merge_request
.
for_fork?
.pull-left
.accept-control
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
=
label_tag
:should_remove_source_branch
,
class:
"checkbox"
do
-
if
can_remove_branch?
(
@merge_request
.
source_project
,
@merge_request
.
source_branch
)
&&
!
@merge_request
.
for_fork?
=
check_box_tag
:should_remove_source_branch
.remove_branch_holder.pull-left
Remove source-branch
=
label_tag
:should_remove_source_branch
,
class:
"checkbox"
do
.accept-control
=
check_box_tag
:should_remove_source_branch
=
link_to
"#"
,
class:
"modify-merge-commit-link js-toggle-button"
,
title:
"Modify merge commit message"
do
Remove source-branch
%i
.fa.fa-edit
.js-toggle-container
Modify commit message
%label
.js-toggle-content.hide.prepend-top-20
%i
.fa.fa-edit
=
render
'shared/commit_message_container'
,
params:
params
,
=
link_to
"modify merge commit message"
,
"#"
,
class:
"modify-merge-commit-link js-toggle-button"
,
title:
"Modify merge commit message"
text:
@merge_request
.
merge_commit_message
,
.js-toggle-content.hide
rows:
14
,
hint:
true
=
render
'shared/commit_message_container'
,
params:
params
,
text:
@merge_request
.
merge_commit_message
,
rows:
14
,
hint:
true
%hr
%hr
.light
.light
...
...
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