summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/issues_controller_spec.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-06-01 03:39:47 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-06-01 03:39:47 +0800
commit554426ddcaa1d8088c0a4e8c649a7a026036df5a (patch)
tree0f794869fb48dfaaead039bc5c8aef9784a1b4f5 /spec/controllers/projects/issues_controller_spec.rb
parent8a1a73a75a4410115b3cc5a85bf5fd85cb634182 (diff)
parentf06daa26efc127565e4e68ca9d4ac62e5a1e3b36 (diff)
downloadgitlab-ce-554426ddcaa1d8088c0a4e8c649a7a026036df5a.tar.gz
Merge remote-tracking branch 'upstream/master' into 24196-protected-variables
* upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
Diffstat (limited to 'spec/controllers/projects/issues_controller_spec.rb')
-rw-r--r--spec/controllers/projects/issues_controller_spec.rb2
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 04afd07c59e..a38ae2eb990 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -204,7 +204,7 @@ describe Projects::IssuesController do
body = JSON.parse(response.body)
expect(body['assignees'].first.keys)
- .to match_array(%w(id name username avatar_url))
+ .to match_array(%w(id name username avatar_url state web_url))
end
end