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
95c03f24
Commit
95c03f24
authored
Dec 16, 2015
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix endpoint not setting needed @ci_commit
parent
e8d35ea1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+3
-6
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
95c03f24
...
@@ -7,7 +7,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -7,7 +7,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action
:closes_issues
,
only:
[
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:closes_issues
,
only:
[
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:validates_merge_request
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:validates_merge_request
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:define_show_vars
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:define_show_vars
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:define_widget_vars
,
only:
[
:merge
,
:cancel_merge_when_build_succeeds
]
before_action
:define_widget_vars
,
only:
[
:merge
,
:cancel_merge_when_build_succeeds
,
:merge_check
]
before_action
:ensure_ref_fetched
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:ensure_ref_fetched
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
# Allow read any merge_request
# Allow read any merge_request
...
@@ -156,11 +156,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -156,11 +156,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
merge_check
def
merge_check
if
@merge_request
.
unchecked?
@merge_request
.
check_if_can_be_merged
if
@merge_request
.
unchecked?
@merge_request
.
check_if_can_be_merged
end
closes_issues
render
partial:
"projects/merge_requests/widget/show.html.haml"
,
layout:
false
render
partial:
"projects/merge_requests/widget/show.html.haml"
,
layout:
false
end
end
...
@@ -302,6 +298,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -302,6 +298,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
define_widget_vars
def
define_widget_vars
@ci_commit
=
@merge_request
.
ci_commit
@ci_commit
=
@merge_request
.
ci_commit
closes_issues
end
end
def
invalid_mr
def
invalid_mr
...
...
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