diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 18:08:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 18:08:07 +0000 |
| commit | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (patch) | |
| tree | e489b6e87557d3f6d8a94f2e7d4d47e633d646b5 /spec/controllers/projects/issues_controller_spec.rb | |
| parent | 4e9acbfba3682c552b3de707c535e6257ef41054 (diff) | |
| download | gitlab-ce-2c72daf2f1744f2b8c8c6674c266907e9ef55558.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/issues_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index add7778b57a..094b50322d1 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -1377,7 +1377,7 @@ describe Projects::IssuesController do it 'returns discussion json' do get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } - expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable resolved resolved_at resolved_by resolved_by_push commit_id for_commit project_id]) + expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable resolved resolved_at resolved_by resolved_by_push commit_id for_commit project_id confidential]) end it 'renders the author status html if there is a status' do |