Commit 2e2d9400 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix_auto_suggested_approvers' into 'master'

Fix for autosuggested approvers

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1273

See merge request !893
parents a2b720d1 a8617c65
...@@ -22,6 +22,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -22,6 +22,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action :close_merge_request_without_source_project, only: [:show, :diffs, :commits, :builds, :pipelines] before_action :close_merge_request_without_source_project, only: [:show, :diffs, :commits, :builds, :pipelines]
before_action :apply_diff_view_cookie!, only: [:new_diffs] before_action :apply_diff_view_cookie!, only: [:new_diffs]
before_action :build_merge_request, only: [:new, :new_diffs] before_action :build_merge_request, only: [:new, :new_diffs]
before_action :set_suggested_approvers, only: [:new, :new_diffs, :edit]
# Allow read any merge_request # Allow read any merge_request
before_action :authorize_read_merge_request! before_action :authorize_read_merge_request!
...@@ -228,7 +229,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -228,7 +229,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def new def new
define_new_vars define_new_vars
set_suggested_approvers
end end
def new_diffs def new_diffs
...@@ -271,8 +271,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -271,8 +271,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@source_project = @merge_request.source_project @source_project = @merge_request.source_project
@target_project = @merge_request.target_project @target_project = @merge_request.target_project
@target_branches = @merge_request.target_project.repository.branch_names @target_branches = @merge_request.target_project.repository.branch_names
set_suggested_approvers
end end
def update def update
......
---
title: Fix for autosuggested approvers(https://gitlab.com/gitlab-org/gitlab-ee/issues/1273)
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment