summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-19 18:09:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-19 18:09:14 +0000
commitcd40e11c5728c995c62e98091aff43b6e4aecabe (patch)
treee3e7aa361c9d76230aeaf63dd3f89a8dff4003f7 /spec/features/projects
parent846dc476d835e43b123e0d66da3a60ed07f10641 (diff)
downloadgitlab-ce-cd40e11c5728c995c62e98091aff43b6e4aecabe.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects')
-rw-r--r--spec/features/projects/branches_spec.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 8123cad4397..d906bb396be 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -199,14 +199,6 @@ RSpec.describe 'Branches' do
project.add_maintainer(user)
end
- describe 'Initial branches page' do
- it 'shows description for admin' do
- visit project_branches_filtered_path(project, state: 'all')
-
- expect(page).to have_content("Protected branches can be managed in project settings")
- end
- end
-
it 'shows the merge request button' do
visit project_branches_path(project)