summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-04-20 12:41:35 -0300
committerFelipe Artur <felipefac@gmail.com>2016-04-20 12:41:35 -0300
commit9581aba4d46f4f31e0ae1f4b76726d5ad01041e7 (patch)
tree4cb6c1839dcc37f4e3d15e5257b3f5a051dfdfb6
parenteb99e5f5c1cb2dfd2e8d058c3866f08aba5f2a4c (diff)
downloadgitlab-ce-issue_5838.tar.gz
Add changelog entry and fix convention in a specissue_5838
-rw-r--r--CHANGELOG1
-rw-r--r--spec/controllers/projects/project_members_controller_spec.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 290c9568149..ee2ffc7035b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,6 +41,7 @@ v 8.7.0 (unreleased)
- Add endpoints to archive or unarchive a project !3372
- Fix a bug whith trailing slash in bamboo_url
- Add links to CI setup documentation from project settings and builds pages
+ - Display project members page to all members
- Handle nil descriptions in Slack issue messages (Stan Hu)
- Add automated repository integrity checks
- API: Expose open_issues_count, closed_issues_count, open_merge_requests_count for labels (Robert Schilling)
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index 1bc5ad4706b..ed64e7cf9af 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -47,7 +47,7 @@ describe Projects::ProjectMembersController do
end
end
- describe 'index' do
+ describe '#index' do
let(:project) { create(:project, :private) }
context 'when user is member' do