diff options
| author | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-07-19 01:55:48 +0900 |
|---|---|---|
| committer | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-07-20 10:16:55 +0900 |
| commit | 1ec5136128364f36f88713f7678188b5d478e6c9 (patch) | |
| tree | 9937f1e4cc391bc55c32d9235fd0b9fe9b157598 | |
| parent | 3453bc328465156bf1fdb4c700c7c3b20d0c1967 (diff) | |
| download | gitlab-ce-1ec5136128364f36f88713f7678188b5d478e6c9.tar.gz | |
Hide description about protected branches to non-member
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/35253-desc-protected-branches-for-non-member.yml | 4 | ||||
| -rw-r--r-- | spec/features/projects/branches_spec.rb | 9 |
3 files changed, 16 insertions, 4 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 8bc1996452b..73583c6bbc2 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -4,9 +4,10 @@ %div{ class: container_class } .top-area.adjust - .nav-text - Protected branches can be managed in - = link_to 'project settings', project_protected_branches_path(@project) + - if can?(current_user, :admin_project, @project) + .nav-text + Protected branches can be managed in + = link_to 'project settings', project_protected_branches_path(@project) .nav-controls = form_tag(filter_branches_path, method: :get) do diff --git a/changelogs/unreleased/35253-desc-protected-branches-for-non-member.yml b/changelogs/unreleased/35253-desc-protected-branches-for-non-member.yml new file mode 100644 index 00000000000..9b2a66da1c3 --- /dev/null +++ b/changelogs/unreleased/35253-desc-protected-branches-for-non-member.yml @@ -0,0 +1,4 @@ +--- +title: Hide description about protected branches to non-member +merge_request: 12945 +author: Takuya Noguchi diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb index 4fae324d8d5..d18cd3d6adc 100644 --- a/spec/features/projects/branches_spec.rb +++ b/spec/features/projects/branches_spec.rb @@ -24,7 +24,6 @@ describe 'Branches', feature: true do repository.branches_sorted_by(:name).first(20).each do |branch| expect(page).to have_content("#{branch.name}") end - expect(page).to have_content("Protected branches can be managed in project settings") end it 'sorts the branches by name' do @@ -130,6 +129,14 @@ describe 'Branches', feature: true do project.team << [user, :master] end + describe 'Initial branches page' do + it 'shows description for admin' do + visit project_branches_path(project) + + expect(page).to have_content("Protected branches can be managed in project settings") + end + end + describe 'Delete protected branch' do before do visit project_protected_branches_path(project) |