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
Kazuhiko Shiozaki
gitlab-ce
Commits
aaf184bf
Commit
aaf184bf
authored
Jan 12, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverting _mr_title.html.haml
parent
7abfe14e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
16 deletions
+10
-16
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+10
-16
No files found.
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
aaf184bf
.detail-page-header
.detail-page-header
-
if
@merge_request
.
merged?
.status-box
{
class:
status_box_class
(
@merge_request
)
}
.status-box
{
class:
"status-box-merged"
}
=
@merge_request
.
state_human_name
Merged
-
else
.status-box
{
class:
"status-box-closed #{merge_request_button_visibility(@merge_request, false)}"
}
Closed
.status-box
{
class:
"status-box-open #{merge_request_button_visibility(@merge_request, true)}"
}
Open
%span
.identifier
%span
.identifier
Merge Request ##{@merge_request.iid}
Merge Request ##{@merge_request.iid}
%span
.creator
%span
.creator
...
@@ -21,11 +15,11 @@
...
@@ -21,11 +15,11 @@
=
time_ago_with_tooltip
(
@merge_request
.
updated_at
,
placement:
'bottom'
)
=
time_ago_with_tooltip
(
@merge_request
.
updated_at
,
placement:
'bottom'
)
.issue-btn-group.pull-right
.issue-btn-group.pull-right
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
&&
!
@merge_request
.
merged?
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
-
if
@merge_request
.
open?
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
},
format:
'json'
),
data:
{
no_turbolink:
true
},
method: :put
,
class:
"btn btn-nr btn-grouped btn-reopen reopen-mr-link
#{
merge_request_button_visibility
(
@merge_request
,
false
)
}
"
,
title:
'Reopen merge request'
=
link_to
'Close'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
'btn btn-nr btn-grouped btn-close'
,
title:
'Close merge request'
=
link_to
'Close'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
},
format:
'json'
),
data:
{
no_turbolink:
true
},
method: :put
,
class:
"btn btn-nr btn-grouped btn-close
#{
merge_request_button_visibility
(
@merge_request
,
true
)
}
"
,
title:
'Close merge request'
=
link_to
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn btn-nr btn-grouped issuable-edit'
,
id:
'edit_merge_request'
do
=
link_to
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
"btn btn-nr btn-grouped issuable-edit
#{
merge_request_button_visibility
(
@merge_request
,
true
)
}
"
,
id:
'edit_merge_request'
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
Edit
Edit
-
if
@merge_request
.
closed?
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'btn btn-nr btn-grouped btn-reopen reopen-mr-link'
,
title:
'Reopen merge request'
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