BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d187ffeb
Unverified
Commit
d187ffeb
authored
Jan 06, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style accept widgets for MR
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b62d4f6d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
28 deletions
+19
-28
merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+3
-12
_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+16
-16
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
d187ffeb
...
@@ -4,10 +4,6 @@
...
@@ -4,10 +4,6 @@
*
*
*/
*/
.automerge_widget
{
.automerge_widget
{
&
.can_be_merged
{
background
:
#DFF0D8
;
}
form
{
form
{
margin-bottom
:
0
;
margin-bottom
:
0
;
.clearfix
{
.clearfix
{
...
@@ -16,10 +12,10 @@
...
@@ -16,10 +12,10 @@
}
}
.accept-group
{
.accept-group
{
label
{
margin
:
5px
;
margin-left
:
20px
;
}
}
.how_to_merge_link
{
@extend
.primary
;
}
}
}
}
...
@@ -33,11 +29,6 @@
...
@@ -33,11 +29,6 @@
}
}
}
}
.merge-in-progress
{
@extend
.padded
;
@extend
.append-bottom-10
;
}
.mr_source_commit
,
.mr_source_commit
,
.mr_target_commit
{
.mr_target_commit
{
.commit
{
.commit
{
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
d187ffeb
-
unless
@allowed_to_merge
-
unless
@allowed_to_merge
.
aler
t
.
bs-callou
t
%strong
You don't have permission to merge this MR
%strong
You don't have permission to merge this MR
-
if
@show_merge_controls
-
if
@show_merge_controls
.automerge_widget.can_be_merged
{
style:
"display:none"
}
.automerge_widget.can_be_merged.hide
.alert.alert-success
.bs-callout.bs-callout-success.clearfix
%span
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :get
do
|
f
|
=
form_for
[
:automerge
,
@project
,
@merge_request
],
remote:
true
,
method: :get
do
|
f
|
%p
%h4
You can accept this request automatically.
You can accept this request automatically.
%p
If you still want to do it manually -
If you still want to do it manually -
%strong
%strong
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
for instructions
for instructions
.accept-group
.accept-group
.pull-left
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
-
unless
@merge_request
.
disallow_source_branch_removal?
-
unless
@merge_request
.
disallow_source_branch_removal?
.remove_branch_holder
.remove_branch_holder.pull-left
=
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
=
check_box_tag
:should_remove_source_branch
Remove source-branch
Remove source-branch
.clearfix
.automerge_widget.no_satellite
{
style:
"display:none"
}
.automerge_widget.no_satellite
.hide
.
alert.aler
t-danger
.
bs-callout.bs-callou
t-danger
%span
%span
%strong
This repository does not have satellite. Ask an administrator to fix this issue
%strong
This repository does not have satellite. Ask an administrator to fix this issue
.automerge_widget.cannot_be_merged
{
style:
"display:none"
}
.automerge_widget.cannot_be_merged
.hide
.
alert.aler
t-disabled
.
bs-callout.bs-callou
t-disabled
%span
%span
=
link_to
"Show how to merge"
,
"#modal_merge_info"
,
class:
"how_to_merge_link btn padded"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
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
%strong
This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.automerge_widget.unchecked
.
alert.aler
t-warning
.
bs-callout.bs-callou
t-warning
%strong
%strong
%i
.icon-refresh
%i
.icon-refresh
.icon-spin
Checking for ability to automatically merge…
Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged
{
style:
"display:none"
}
.automerge_widget.already_cannot_be_merged
.hide
.
alert.aler
t-info
.
bs-callout.bs-callou
t-info
%strong
This merge request already can not be merged. Try to reload page.
%strong
This merge request already can not be merged. Try to reload page.
.merge-in-progress.hide
.merge-in-progress.hide
%span
.cgray
.bs-callout.bs-callout-success
%i
.icon-refresh.icon-spin
%i
.icon-refresh.icon-spin
Merge is in progress. Please wait. Page will be automatically reloaded.
Merge is in progress. Please wait. Page will be automatically reloaded.
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