diff options
author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-16 15:20:53 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-16 15:20:53 +0100 |
commit | 95c03f245f2fd25d6d38715630859859965965ee (patch) | |
tree | 53c9acaa1d3604c3d87ec9a1308b3c5c2ec980b9 | |
parent | e8d35ea149f1d40768d99835c30d40e4028953f0 (diff) | |
download | gitlab-ce-95c03f245f2fd25d6d38715630859859965965ee.tar.gz |
Fix endpoint not setting needed @ci_commit
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index e8fa10fafb1..f98401d4bbf 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -7,7 +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 :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check] before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds] # Allow read any merge_request @@ -156,11 +156,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def merge_check - if @merge_request.unchecked? - @merge_request.check_if_can_be_merged - end - - closes_issues + @merge_request.check_if_can_be_merged if @merge_request.unchecked? render partial: "projects/merge_requests/widget/show.html.haml", layout: false end @@ -302,6 +298,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def define_widget_vars @ci_commit = @merge_request.ci_commit + closes_issues end def invalid_mr |