diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:59:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:59:30 +0100 |
| commit | 28351806aa1f89f584d6905365fd34f5f0e8bbc7 (patch) | |
| tree | 8342ab8796706a98287268799ba4ee38eb3e3f35 | |
| parent | eab086bde11f30551b4a8b27b0a344e654924a1c (diff) | |
| download | gitlab-ce-28351806aa1f89f584d6905365fd34f5f0e8bbc7.tar.gz | |
Give merge request widget the vars it desires
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 3240c77e994..530f3d3dcb8 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -7,6 +7,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController before_action :closes_issues, only: [:edit, :update, :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_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds] before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds] # Allow read any merge_request @@ -301,6 +302,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController end end + def define_widget_vars + @ci_commit = @merge_request.ci_commit + end + def invalid_mr # Render special view for MR with removed source or target branch render 'invalid' |