diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-16 17:50:45 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-16 17:50:45 +0300 |
| commit | 28d9645926f0c475c825b32912c678132c09e3a4 (patch) | |
| tree | 49a4c6f240ffac1663ca16a79db8033047f719b6 /spec/controllers | |
| parent | 3255401e06a16ea259cdbe730f546a6fc98d5540 (diff) | |
| parent | d211011698016bd4f04bc32e7450d6df470ea0c2 (diff) | |
Merge branch '21992-disable-access-requests-by-default' into 'master'
Disable the "request access" functionality by default for new groups and projects
Currently this feature is enabled by default, and additional action is required to disable it.
Closes #21992
Closes !7011
See merge request !7425
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/groups/group_members_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/project_members_controller_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb index c7db84dd5f9..60db0192dfd 100644 --- a/spec/controllers/groups/group_members_controller_spec.rb +++ b/spec/controllers/groups/group_members_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Groups::GroupMembersController do let(:user) { create(:user) } - let(:group) { create(:group, :public) } + let(:group) { create(:group, :public, :access_requestable) } describe 'GET index' do it 'renders index with 200 status code' do diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb index 2a7523c6512..b52137fbe7e 100644 --- a/spec/controllers/projects/project_members_controller_spec.rb +++ b/spec/controllers/projects/project_members_controller_spec.rb @@ -2,7 +2,7 @@ require('spec_helper') describe Projects::ProjectMembersController do let(:user) { create(:user) } - let(:project) { create(:project, :public) } + let(:project) { create(:empty_project, :public, :access_requestable) } describe 'GET index' do it 'renders index with 200 status code' do |