diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-07-02 09:23:47 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-02 09:23:47 +0300 |
| commit | 91820f967db8aef75d247a61f4843fb0cdf23d89 (patch) | |
| tree | 1476666650d285030fc693071e277c8695429961 /spec/controllers/projects | |
| parent | fa77293bdca13d056dc7214583c3a0b370d18531 (diff) | |
| parent | 12d7b3937fa97048d5bd6c09769e837052ebb3db (diff) | |
Merge branch 'security-notes-in-private-snippets' into 'master'
Ability to write a note in a private snippet
See merge request gitlab/gitlabhq!3133
Diffstat (limited to 'spec/controllers/projects')
| -rw-r--r-- | spec/controllers/projects/notes_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 6ec84f5c528..1db1963476c 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -252,7 +252,7 @@ describe Projects::NotesController do before do service_params = ActionController::Parameters.new({ note: 'some note', - noteable_id: merge_request.id.to_s, + noteable_id: merge_request.id, noteable_type: 'MergeRequest', commit_id: nil, merge_request_diff_head_sha: 'sha' |