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
c0220198
Commit
c0220198
authored
Jan 12, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing last chunk of MR ajax changes, rest will be in another MR
parent
63363e47
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
5 deletions
+17
-5
app/models/merge_request.rb
app/models/merge_request.rb
+10
-0
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+4
-2
app/views/projects/merge_requests/widget/_closed.html.haml
app/views/projects/merge_requests/widget/_closed.html.haml
+1
-1
app/views/projects/merge_requests/widget/_locked.html.haml
app/views/projects/merge_requests/widget/_locked.html.haml
+1
-1
app/views/projects/merge_requests/widget/_merged.html.haml
app/views/projects/merge_requests/widget/_merged.html.haml
+1
-1
No files found.
app/models/merge_request.rb
View file @
c0220198
...
@@ -466,6 +466,16 @@ class MergeRequest < ActiveRecord::Base
...
@@ -466,6 +466,16 @@ class MergeRequest < ActiveRecord::Base
::
Gitlab
::
GitAccess
.
new
(
user
,
project
).
can_push_to_branch?
(
target_branch
)
::
Gitlab
::
GitAccess
.
new
(
user
,
project
).
can_push_to_branch?
(
target_branch
)
end
end
def
state_human_name
if
merged?
"Merged"
elsif
closed?
"Closed"
else
"Open"
end
end
def
target_sha
def
target_sha
@target_sha
||=
target_project
.
@target_sha
||=
target_project
.
repository
.
commit
(
target_branch
).
sha
repository
.
commit
(
target_branch
).
sha
...
...
app/views/projects/issues/_discussion.html.haml
View file @
c0220198
-
content_for
:note_actions
do
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"btn btn-nr btn-grouped btn-reopen btn-comment js-note-target-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen Issue'
-
if
@issue
.
closed?
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"btn btn-nr btn-grouped btn-close btn-comment js-note-target-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close Issue'
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-nr btn-grouped btn-reopen js-note-target-reopen'
,
title:
'Reopen Issue'
-
else
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-nr btn-grouped btn-close js-note-target-close'
,
title:
'Close Issue'
#notes
#notes
=
render
'projects/notes/notes_with_form'
=
render
'projects/notes/notes_with_form'
app/views/projects/merge_requests/widget/_closed.html.haml
View file @
c0220198
.mr-state-widget
.mr-state-widget-closed
{
class:
merge_request_widget_visibility
(
@merge_request
,
'closed'
)}
.mr-state-widget
=
render
'projects/merge_requests/widget/heading'
=
render
'projects/merge_requests/widget/heading'
.mr-widget-body
.mr-widget-body
%h4
%h4
...
...
app/views/projects/merge_requests/widget/_locked.html.haml
View file @
c0220198
.mr-state-widget
.mr-state-widget-locked
{
class:
merge_request_widget_visibility
(
@merge_request
,
'locked'
)}
.mr-state-widget
=
render
'projects/merge_requests/widget/heading'
=
render
'projects/merge_requests/widget/heading'
.mr-widget-body
.mr-widget-body
%h4
%h4
...
...
app/views/projects/merge_requests/widget/_merged.html.haml
View file @
c0220198
.mr-state-widget
.mr-state-widget-merged
{
class:
merge_request_widget_visibility
(
@merge_request
,
'merged'
)}
.mr-state-widget
=
render
'projects/merge_requests/widget/heading'
=
render
'projects/merge_requests/widget/heading'
.mr-widget-body
.mr-widget-body
%h4
%h4
...
...
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