diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 19:45:01 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 19:45:01 +0300 |
| commit | b93f1d3cf8d5325c9fc9283afacfca069ddc3d62 (patch) | |
| tree | f4b896235f33814b874a8e020d31e2669ae2d8a4 /spec/views | |
| parent | d4e54b7ea68b5f9a687d23e86be6935762b9fc51 (diff) | |
| parent | 487ac98a2a7cebb1bdef3a5038c926c56380881c (diff) | |
Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-ce' into 'master'
[master] CE: Project group approvers leaks private group info
See merge request gitlab/gitlabhq!2488
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 8befae39d3a..0206928a211 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 @@ -12,6 +12,7 @@ describe 'projects/merge_requests/creations/_new_submit.html.haml' do assign(:hidden_commit_count, 0) assign(:total_commit_count, merge_request.commits.count) 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) |