Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
afe86399
Commit
afe86399
authored
Apr 18, 2022
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove setting link from branches page
Changelog: changed
parent
59217ae2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
20 deletions
+1
-20
app/views/projects/branches/_panel.html.haml
app/views/projects/branches/_panel.html.haml
+1
-1
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+0
-5
locale/gitlab.pot
locale/gitlab.pot
+0
-6
spec/features/projects/branches_spec.rb
spec/features/projects/branches_spec.rb
+0
-8
No files found.
app/views/projects/branches/_panel.html.haml
View file @
afe86399
...
...
@@ -7,7 +7,7 @@
-
return
unless
branches
.
any?
.card
.gl-mt-3
.card
.card-header
=
panel_title
%ul
.content-list.all-branches.qa-all-branches
...
...
app/views/projects/branches/index.html.haml
View file @
afe86399
...
...
@@ -27,11 +27,6 @@
=
render_if_exists
'projects/commits/mirror_status'
.js-branch-list
{
data:
{
diverging_counts_endpoint:
diverging_commit_counts_namespace_project_branches_path
(
@project
.
namespace
,
@project
,
format: :json
),
default_branch:
@project
.
default_branch
}
}
-
if
can?
(
current_user
,
:admin_project
,
@project
)
-
project_settings_link
=
link_to
s_
(
'Branches|project settings'
),
project_protected_branches_path
(
@project
)
.row-content-block
%h5
=
s_
(
'Branches|Protected branches can be managed in %{project_settings_link}.'
).
html_safe
%
{
project_settings_link:
project_settings_link
}
-
if
@gitaly_unavailable
=
render
'shared/errors/gitaly_unavailable'
,
reason:
s_
(
'Branches|Unable to load branches'
)
...
...
locale/gitlab.pot
View file @
afe86399
...
...
@@ -6262,9 +6262,6 @@ msgstr ""
msgid "Branches|Please type the following to confirm:"
msgstr ""
msgid "Branches|Protected branches can be managed in %{project_settings_link}."
msgstr ""
msgid "Branches|Show active branches"
msgstr ""
...
...
@@ -6322,9 +6319,6 @@ msgstr ""
msgid "Branches|merged"
msgstr ""
msgid "Branches|project settings"
msgstr ""
msgid "Branches|protected"
msgstr ""
...
...
spec/features/projects/branches_spec.rb
View file @
afe86399
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment