Give merge request widget the vars it desires
This commit is contained in:
parent
eab086bde1
commit
28351806aa
|
@ -7,6 +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 :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
|
||||||
|
@ -301,6 +302,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def define_widget_vars
|
||||||
|
@ci_commit = @merge_request.ci_commit
|
||||||
|
end
|
||||||
|
|
||||||
def invalid_mr
|
def invalid_mr
|
||||||
# Render special view for MR with removed source or target branch
|
# Render special view for MR with removed source or target branch
|
||||||
render 'invalid'
|
render 'invalid'
|
||||||
|
|
Loading…
Reference in New Issue