Commit 1346756f authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix-fork-mr-labels' into 'master'

Fix bug where non-project members of the target project could set labels on new merge requests.

Fixes #2292.

See merge request !1180
......@@ -11,6 +11,7 @@ v 8.0.0 (unreleased)
- Search for comments should be case insensetive
v 7.14.0 (unreleased)
- Fix bug where non-project members of the target project could set labels on new merge requests.
- Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
- Fix redirection after sign in when using auto_sign_in_with_provider
- Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules (Stan Hu)
......
......@@ -38,7 +38,7 @@
.clearfix
.error-alert
%hr
- if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
- if can?(current_user, :"admin_#{issuable.to_ability_name}", issuable.project)
.form-group
.issue-assignee
= f.label :assignee_id, class: 'control-label' do
......
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