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
Jérome Perrin
gitlab-ce
Commits
b0eb4cb4
Commit
b0eb4cb4
authored
Jun 07, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename @ci_commit to @pipeline in MergeRequestController
parent
93eb844d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+4
-4
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
b0eb4cb4
...
@@ -317,8 +317,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -317,8 +317,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request_diff
=
@merge_request
.
merge_request_diff
@merge_request_diff
=
@merge_request
.
merge_request_diff
@
ci_commit
=
@merge_request
.
pipeline
@
pipeline
=
@merge_request
.
pipeline
@statuses
=
@
ci_commit
.
statuses
if
@ci_commit
@statuses
=
@
pipeline
.
statuses
if
@pipeline
if
@merge_request
.
locked_long_ago?
if
@merge_request
.
locked_long_ago?
@merge_request
.
unlock_mr
@merge_request
.
unlock_mr
...
@@ -327,8 +327,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -327,8 +327,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
define_widget_vars
def
define_widget_vars
@
ci_commit
=
@merge_request
.
pipeline
@
pipeline
=
@merge_request
.
pipeline
@
ci_commits
=
[
@ci_commit
].
compact
@
pipelines
=
[
@pipeline
].
compact
closes_issues
closes_issues
end
end
...
...
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