diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-09-24 18:46:20 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-09-24 19:00:23 +0300 |
| commit | 9730d13ba01cba7bd3c8e32265fd5d286218b27a (patch) | |
| tree | b561051c3ae6b470a25249d837adeda0c72c9065 /spec/views | |
| parent | 33fe84893d735b24dfbc49e58c48175dbddee4a8 (diff) | |
Merge branch 'security-11-2-6881-project-group-approvers-leaks-private-group-info-ce' into 'security-11-2'
[11.2] Project group approvers leaks private group info
See merge request gitlab/gitlabhq!2489
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb | 1 | ||||
| -rw-r--r-- | spec/views/projects/merge_requests/edit.html.haml_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb index 9ab105c3238..1822875f0fd 100644 --- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb @@ -10,6 +10,7 @@ describe 'projects/merge_requests/creations/_new_submit.html.haml' do assign(:merge_request, merge_request) assign(:commits, merge_request.commits) assign(:project, merge_request.target_project) + assign(:mr_presenter, merge_request.present(current_user: merge_request.author)) allow(view).to receive(:can?).and_return(true) allow(view).to receive(:url_for).and_return('#') diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb index 9b74a7e1946..c13eab30054 100644 --- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb @@ -24,6 +24,7 @@ describe 'projects/merge_requests/edit.html.haml' do before do assign(:project, project) assign(:merge_request, closed_merge_request) + assign(:mr_presenter, closed_merge_request.present(current_user: user)) allow(view).to receive(:can?).and_return(true) allow(view).to receive(:current_user) |