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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a8617c65
Commit
a8617c65
authored
Nov 21, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for autosuggested approvers
parent
3a65bed4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-3
changelogs/unreleased-ee/fix_auto_suggested_approvers.yml
changelogs/unreleased-ee/fix_auto_suggested_approvers.yml
+4
-0
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
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
...
...
changelogs/unreleased-ee/fix_auto_suggested_approvers.yml
0 → 100644
View file @
a8617c65
---
title
:
Fix for autosuggested approvers(https://gitlab.com/gitlab-org/gitlab-ee/issues/1273)
merge_request
:
author
:
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