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
676799bf
Commit
676799bf
authored
Mar 10, 2021
by
Marcel Amirault
Committed by
Mike Greiling
Mar 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update UI to use CI/CD without spaces
The standard is to use CI/CD not CI / CD
parent
db33a339
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
47 additions
and
45 deletions
+47
-45
app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
.../projects/pipelines/charts/components/pipeline_charts.vue
+1
-1
app/helpers/analytics/navbar_helper.rb
app/helpers/analytics/navbar_helper.rb
+1
-1
app/views/groups/settings/ci_cd/show.html.haml
app/views/groups/settings/ci_cd/show.html.haml
+2
-2
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+2
-2
app/views/layouts/nav/sidebar/_project.html.haml
app/views/layouts/nav/sidebar/_project.html.haml
+4
-4
app/views/projects/pipelines/charts.html.haml
app/views/projects/pipelines/charts.html.haml
+1
-1
app/views/projects/settings/ci_cd/show.html.haml
app/views/projects/settings/ci_cd/show.html.haml
+2
-2
changelogs/unreleased/update-cicd-naming.yml
changelogs/unreleased/update-cicd-naming.yml
+5
-0
ee/app/helpers/ee/analytics/navbar_helper.rb
ee/app/helpers/ee/analytics/navbar_helper.rb
+1
-1
ee/app/views/groups/analytics/ci_cd_analytics/show.html.haml
ee/app/views/groups/analytics/ci_cd_analytics/show.html.haml
+1
-1
ee/spec/helpers/ee/groups_helper_spec.rb
ee/spec/helpers/ee/groups_helper_spec.rb
+3
-3
ee/spec/policies/group_policy_spec.rb
ee/spec/policies/group_policy_spec.rb
+3
-3
locale/gitlab.pot
locale/gitlab.pot
+7
-10
qa/qa/page/project/sub_menus/settings.rb
qa/qa/page/project/sub_menus/settings.rb
+1
-1
spec/features/projects/active_tabs_spec.rb
spec/features/projects/active_tabs_spec.rb
+3
-3
spec/features/projects/user_sees_sidebar_spec.rb
spec/features/projects/user_sees_sidebar_spec.rb
+2
-2
spec/features/projects/user_uses_shortcuts_spec.rb
spec/features/projects/user_uses_shortcuts_spec.rb
+2
-2
spec/support/shared_contexts/navbar_structure_context.rb
spec/support/shared_contexts/navbar_structure_context.rb
+4
-4
spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+2
-2
No files found.
app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue
View file @
676799bf
...
@@ -292,7 +292,7 @@ export default {
...
@@ -292,7 +292,7 @@ export default {
failure
.
text
failure
.
text
}}
</gl-alert>
}}
</gl-alert>
<div
class=
"gl-mb-3"
>
<div
class=
"gl-mb-3"
>
<h3>
{{
s__
(
'
PipelineCharts|CI
/
CD Analytics
'
)
}}
</h3>
<h3>
{{
s__
(
'
PipelineCharts|CI
/
CD Analytics
'
)
}}
</h3>
</div>
</div>
<h4
class=
"gl-my-4"
>
{{
s__
(
'
PipelineCharts|Overall statistics
'
)
}}
</h4>
<h4
class=
"gl-my-4"
>
{{
s__
(
'
PipelineCharts|Overall statistics
'
)
}}
</h4>
<div
class=
"row"
>
<div
class=
"row"
>
...
...
app/helpers/analytics/navbar_helper.rb
View file @
676799bf
...
@@ -58,7 +58,7 @@ module Analytics
...
@@ -58,7 +58,7 @@ module Analytics
return
unless
project
.
feature_available?
(
:builds
,
current_user
)
||
!
project
.
empty_repo?
return
unless
project
.
feature_available?
(
:builds
,
current_user
)
||
!
project
.
empty_repo?
navbar_sub_item
(
navbar_sub_item
(
title:
_
(
'CI
/
CD'
),
title:
_
(
'CI
/
CD'
),
path:
'pipelines#charts'
,
path:
'pipelines#charts'
,
link:
charts_project_pipelines_path
(
project
)
link:
charts_project_pipelines_path
(
project
)
)
)
...
...
app/views/groups/settings/ci_cd/show.html.haml
View file @
676799bf
-
breadcrumb_title
_
(
"CI
/
CD Settings"
)
-
breadcrumb_title
_
(
"CI
/
CD Settings"
)
-
page_title
_
(
"CI
/
CD"
)
-
page_title
_
(
"CI
/
CD"
)
-
expanded
=
expanded_by_default?
-
expanded
=
expanded_by_default?
-
general_expanded
=
@group
.
errors
.
empty?
?
expanded
:
true
-
general_expanded
=
@group
.
errors
.
empty?
?
expanded
:
true
...
...
app/views/layouts/nav/sidebar/_group.html.haml
View file @
676799bf
...
@@ -171,9 +171,9 @@
...
@@ -171,9 +171,9 @@
=
_
(
'Repository'
)
=
_
(
'Repository'
)
=
nav_link
(
controller: :ci_cd
)
do
=
nav_link
(
controller: :ci_cd
)
do
=
link_to
group_settings_ci_cd_path
(
@group
),
title:
_
(
'CI
/
CD'
)
do
=
link_to
group_settings_ci_cd_path
(
@group
),
title:
_
(
'CI
/
CD'
)
do
%span
%span
=
_
(
'CI
/
CD'
)
=
_
(
'CI
/
CD'
)
=
render
'groups/sidebar/packages_settings'
=
render
'groups/sidebar/packages_settings'
...
...
app/views/layouts/nav/sidebar/_project.html.haml
View file @
676799bf
...
@@ -179,13 +179,13 @@
...
@@ -179,13 +179,13 @@
.nav-icon-container
.nav-icon-container
=
sprite_icon
(
'rocket'
)
=
sprite_icon
(
'rocket'
)
%span
.nav-item-name
#js-onboarding-pipelines-link
%span
.nav-item-name
#js-onboarding-pipelines-link
=
_
(
'CI
/
CD'
)
=
_
(
'CI
/
CD'
)
%ul
.sidebar-sub-level-items
%ul
.sidebar-sub-level-items
=
nav_link
(
controller:
[
:pipelines
,
:builds
,
:jobs
,
:pipeline_schedules
,
:artifacts
,
:test_cases
,
:pipeline_editor
],
html_options:
{
class:
"fly-out-top-item"
})
do
=
nav_link
(
controller:
[
:pipelines
,
:builds
,
:jobs
,
:pipeline_schedules
,
:artifacts
,
:test_cases
,
:pipeline_editor
],
html_options:
{
class:
"fly-out-top-item"
})
do
=
link_to
project_pipelines_path
(
@project
)
do
=
link_to
project_pipelines_path
(
@project
)
do
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
=
_
(
'CI
/
CD'
)
=
_
(
'CI
/
CD'
)
%li
.divider.fly-out-top-item
%li
.divider.fly-out-top-item
-
if
project_nav_tab?
:pipelines
-
if
project_nav_tab?
:pipelines
=
nav_link
(
path:
[
'pipelines#index'
,
'pipelines#show'
])
do
=
nav_link
(
path:
[
'pipelines#index'
,
'pipelines#show'
])
do
...
@@ -418,9 +418,9 @@
...
@@ -418,9 +418,9 @@
=
_
(
'Repository'
)
=
_
(
'Repository'
)
-
if
!
@project
.
archived?
&&
@project
.
feature_available?
(
:builds
,
current_user
)
-
if
!
@project
.
archived?
&&
@project
.
feature_available?
(
:builds
,
current_user
)
=
nav_link
(
controller: :ci_cd
)
do
=
nav_link
(
controller: :ci_cd
)
do
=
link_to
project_settings_ci_cd_path
(
@project
),
title:
_
(
'CI
/
CD'
)
do
=
link_to
project_settings_ci_cd_path
(
@project
),
title:
_
(
'CI
/
CD'
)
do
%span
%span
=
_
(
'CI
/
CD'
)
=
_
(
'CI
/
CD'
)
-
if
settings_operations_available?
-
if
settings_operations_available?
=
nav_link
(
controller:
[
:operations
])
do
=
nav_link
(
controller:
[
:operations
])
do
=
link_to
project_settings_operations_path
(
@project
),
title:
_
(
'Operations'
),
data:
{
qa_selector:
'operations_settings_link'
}
do
=
link_to
project_settings_operations_path
(
@project
),
title:
_
(
'Operations'
),
data:
{
qa_selector:
'operations_settings_link'
}
do
...
...
app/views/projects/pipelines/charts.html.haml
View file @
676799bf
-
page_title
_
(
'CI
/
CD Analytics'
)
-
page_title
_
(
'CI
/
CD Analytics'
)
#js-project-pipelines-charts-app
{
data:
{
project_path:
@project
.
full_path
,
#js-project-pipelines-charts-app
{
data:
{
project_path:
@project
.
full_path
,
should_render_deployment_frequency_charts:
should_render_deployment_frequency_charts
.
to_s
}
}
should_render_deployment_frequency_charts:
should_render_deployment_frequency_charts
.
to_s
}
}
app/views/projects/settings/ci_cd/show.html.haml
View file @
676799bf
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
_
(
"CI
/
CD Settings"
)
-
page_title
_
(
"CI
/
CD Settings"
)
-
page_title
_
(
"CI
/
CD"
)
-
page_title
_
(
"CI
/
CD"
)
-
expanded
=
expanded_by_default?
-
expanded
=
expanded_by_default?
-
general_expanded
=
@project
.
errors
.
empty?
?
expanded
:
true
-
general_expanded
=
@project
.
errors
.
empty?
?
expanded
:
true
...
...
changelogs/unreleased/update-cicd-naming.yml
0 → 100644
View file @
676799bf
---
title
:
Update UI text to CI/CD from CI / CD
merge_request
:
56070
author
:
type
:
other
ee/app/helpers/ee/analytics/navbar_helper.rb
View file @
676799bf
...
@@ -132,7 +132,7 @@ module EE
...
@@ -132,7 +132,7 @@ module EE
return
unless
group_sidebar_link?
(
:group_ci_cd_analytics
)
return
unless
group_sidebar_link?
(
:group_ci_cd_analytics
)
navbar_sub_item
(
navbar_sub_item
(
title:
_
(
'CI
/
CD'
),
title:
_
(
'CI
/
CD'
),
path:
'groups/analytics/ci_cd_analytics#show'
,
path:
'groups/analytics/ci_cd_analytics#show'
,
link:
group_analytics_ci_cd_analytics_path
(
group
)
link:
group_analytics_ci_cd_analytics_path
(
group
)
)
)
...
...
ee/app/views/groups/analytics/ci_cd_analytics/show.html.haml
View file @
676799bf
-
page_title
_
(
"CI
/
CD Analytics"
)
-
page_title
_
(
"CI
/
CD Analytics"
)
#js-group-ci-cd-analytics-app
{
data:
{
full_path:
@group
.
full_path
}
}
#js-group-ci-cd-analytics-app
{
data:
{
full_path:
@group
.
full_path
}
}
ee/spec/helpers/ee/groups_helper_spec.rb
View file @
676799bf
...
@@ -91,19 +91,19 @@ RSpec.describe GroupsHelper do
...
@@ -91,19 +91,19 @@ RSpec.describe GroupsHelper do
stub_feature_flags
(
group_ci_cd_analytics_page:
false
)
stub_feature_flags
(
group_ci_cd_analytics_page:
false
)
end
end
it
'hides CI
/
CD Analytics'
do
it
'hides CI
/
CD Analytics'
do
expect
(
helper
.
group_sidebar_links
).
not_to
include
(
:group_ci_cd_analytics
)
expect
(
helper
.
group_sidebar_links
).
not_to
include
(
:group_ci_cd_analytics
)
end
end
end
end
context
'when the user does not have permissions to view the CI
/
CD Analytics page'
do
context
'when the user does not have permissions to view the CI
/
CD Analytics page'
do
let
(
:current_user
)
{
create
(
:user
)
}
let
(
:current_user
)
{
create
(
:user
)
}
before
do
before
do
group
.
add_guest
(
current_user
)
group
.
add_guest
(
current_user
)
end
end
it
'hides CI
/
CD Analytics'
do
it
'hides CI
/
CD Analytics'
do
expect
(
helper
.
group_sidebar_links
).
not_to
include
(
:group_ci_cd_analytics
)
expect
(
helper
.
group_sidebar_links
).
not_to
include
(
:group_ci_cd_analytics
)
end
end
end
end
...
...
ee/spec/policies/group_policy_spec.rb
View file @
676799bf
...
@@ -232,8 +232,8 @@ RSpec.describe GroupPolicy do
...
@@ -232,8 +232,8 @@ RSpec.describe GroupPolicy do
it
{
is_expected
.
not_to
be_allowed
(
:read_group_activity_analytics
)
}
it
{
is_expected
.
not_to
be_allowed
(
:read_group_activity_analytics
)
}
end
end
context
'group CI
/
CD analytics'
do
context
'group CI
/
CD analytics'
do
context
'when group CI
/
CD analytics is available'
do
context
'when group CI
/
CD analytics is available'
do
before
do
before
do
stub_licensed_features
(
group_ci_cd_analytics:
true
)
stub_licensed_features
(
group_ci_cd_analytics:
true
)
end
end
...
@@ -251,7 +251,7 @@ RSpec.describe GroupPolicy do
...
@@ -251,7 +251,7 @@ RSpec.describe GroupPolicy do
end
end
end
end
context
'when group CI
/
CD analytics is not available'
do
context
'when group CI
/
CD analytics is not available'
do
let
(
:current_user
)
{
reporter
}
let
(
:current_user
)
{
reporter
}
before
do
before
do
...
...
locale/gitlab.pot
View file @
676799bf
...
@@ -5199,15 +5199,6 @@ msgstr ""
...
@@ -5199,15 +5199,6 @@ msgstr ""
msgid "CHANGELOG"
msgid "CHANGELOG"
msgstr ""
msgstr ""
msgid "CI / CD"
msgstr ""
msgid "CI / CD Analytics"
msgstr ""
msgid "CI / CD Settings"
msgstr ""
msgid "CI Lint"
msgid "CI Lint"
msgstr ""
msgstr ""
...
@@ -5226,6 +5217,12 @@ msgstr ""
...
@@ -5226,6 +5217,12 @@ msgstr ""
msgid "CI/CD"
msgid "CI/CD"
msgstr ""
msgstr ""
msgid "CI/CD Analytics"
msgstr ""
msgid "CI/CD Settings"
msgstr ""
msgid "CI/CD configuration"
msgid "CI/CD configuration"
msgstr ""
msgstr ""
...
@@ -22115,7 +22112,7 @@ msgstr ""
...
@@ -22115,7 +22112,7 @@ msgstr ""
msgid "PipelineCharts|An unknown error occurred while processing CI/CD analytics."
msgid "PipelineCharts|An unknown error occurred while processing CI/CD analytics."
msgstr ""
msgstr ""
msgid "PipelineCharts|CI
/
CD Analytics"
msgid "PipelineCharts|CI
/
CD Analytics"
msgstr ""
msgstr ""
msgid "PipelineCharts|Failed:"
msgid "PipelineCharts|Failed:"
...
...
qa/qa/page/project/sub_menus/settings.rb
View file @
676799bf
...
@@ -25,7 +25,7 @@ module QA
...
@@ -25,7 +25,7 @@ module QA
def
go_to_ci_cd_settings
def
go_to_ci_cd_settings
hover_settings
do
hover_settings
do
within_submenu
do
within_submenu
do
click_link
(
'CI
/
CD'
)
click_link
(
'CI
/
CD'
)
end
end
end
end
end
end
...
...
spec/features/projects/active_tabs_spec.rb
View file @
676799bf
...
@@ -132,13 +132,13 @@ RSpec.describe 'Project active tab' do
...
@@ -132,13 +132,13 @@ RSpec.describe 'Project active tab' do
it_behaves_like
'page has active sub tab'
,
_
(
'Value Stream'
)
it_behaves_like
'page has active sub tab'
,
_
(
'Value Stream'
)
end
end
context
'on project Analytics/"CI
/
CD"'
do
context
'on project Analytics/"CI
/
CD"'
do
before
do
before
do
click_tab
(
_
(
'CI
/
CD'
))
click_tab
(
_
(
'CI
/
CD'
))
end
end
it_behaves_like
'page has active tab'
,
_
(
'Analytics'
)
it_behaves_like
'page has active tab'
,
_
(
'Analytics'
)
it_behaves_like
'page has active sub tab'
,
_
(
'CI
/
CD'
)
it_behaves_like
'page has active sub tab'
,
_
(
'CI
/
CD'
)
end
end
end
end
end
end
spec/features/projects/user_sees_sidebar_spec.rb
View file @
676799bf
...
@@ -201,7 +201,7 @@ RSpec.describe 'Projects > User sees sidebar' do
...
@@ -201,7 +201,7 @@ RSpec.describe 'Projects > User sees sidebar' do
expect
(
page
).
to
have_content
'Operations'
expect
(
page
).
to
have_content
'Operations'
expect
(
page
).
not_to
have_content
'Repository'
expect
(
page
).
not_to
have_content
'Repository'
expect
(
page
).
not_to
have_content
'CI
/
CD'
expect
(
page
).
not_to
have_content
'CI
/
CD'
expect
(
page
).
not_to
have_content
'Merge Requests'
expect
(
page
).
not_to
have_content
'Merge Requests'
end
end
end
end
...
@@ -213,7 +213,7 @@ RSpec.describe 'Projects > User sees sidebar' do
...
@@ -213,7 +213,7 @@ RSpec.describe 'Projects > User sees sidebar' do
visit
project_path
(
project
)
visit
project_path
(
project
)
within
(
'.nav-sidebar'
)
do
within
(
'.nav-sidebar'
)
do
expect
(
page
).
to
have_content
'CI
/
CD'
expect
(
page
).
to
have_content
'CI
/
CD'
end
end
end
end
...
...
spec/features/projects/user_uses_shortcuts_spec.rb
View file @
676799bf
...
@@ -155,12 +155,12 @@ RSpec.describe 'User uses shortcuts', :js do
...
@@ -155,12 +155,12 @@ RSpec.describe 'User uses shortcuts', :js do
end
end
end
end
context
'when navigating to the CI
/
CD pages'
do
context
'when navigating to the CI
/
CD pages'
do
it
'redirects to the Jobs page'
do
it
'redirects to the Jobs page'
do
find
(
'body'
).
native
.
send_key
(
'g'
)
find
(
'body'
).
native
.
send_key
(
'g'
)
find
(
'body'
).
native
.
send_key
(
'j'
)
find
(
'body'
).
native
.
send_key
(
'j'
)
expect
(
page
).
to
have_active_navigation
(
'CI
/
CD'
)
expect
(
page
).
to
have_active_navigation
(
'CI
/
CD'
)
expect
(
page
).
to
have_active_sub_navigation
(
'Jobs'
)
expect
(
page
).
to
have_active_sub_navigation
(
'Jobs'
)
end
end
end
end
...
...
spec/support/shared_contexts/navbar_structure_context.rb
View file @
676799bf
...
@@ -5,7 +5,7 @@ RSpec.shared_context 'project navbar structure' do
...
@@ -5,7 +5,7 @@ RSpec.shared_context 'project navbar structure' do
{
{
nav_item:
_
(
'Analytics'
),
nav_item:
_
(
'Analytics'
),
nav_sub_items:
[
nav_sub_items:
[
_
(
'CI
/
CD'
),
_
(
'CI
/
CD'
),
(
_
(
'Code Review'
)
if
Gitlab
.
ee?
),
(
_
(
'Code Review'
)
if
Gitlab
.
ee?
),
(
_
(
'Merge Request'
)
if
Gitlab
.
ee?
),
(
_
(
'Merge Request'
)
if
Gitlab
.
ee?
),
_
(
'Repository'
),
_
(
'Repository'
),
...
@@ -63,7 +63,7 @@ RSpec.shared_context 'project navbar structure' do
...
@@ -63,7 +63,7 @@ RSpec.shared_context 'project navbar structure' do
nav_sub_items:
[]
nav_sub_items:
[]
},
},
{
{
nav_item:
_
(
'CI
/
CD'
),
nav_item:
_
(
'CI
/
CD'
),
nav_sub_items:
[
nav_sub_items:
[
_
(
'Pipelines'
),
_
(
'Pipelines'
),
s_
(
'Pipelines|Editor'
),
s_
(
'Pipelines|Editor'
),
...
@@ -111,7 +111,7 @@ RSpec.shared_context 'project navbar structure' do
...
@@ -111,7 +111,7 @@ RSpec.shared_context 'project navbar structure' do
_
(
'Webhooks'
),
_
(
'Webhooks'
),
_
(
'Access Tokens'
),
_
(
'Access Tokens'
),
_
(
'Repository'
),
_
(
'Repository'
),
_
(
'CI
/
CD'
),
_
(
'CI
/
CD'
),
_
(
'Operations'
)
_
(
'Operations'
)
].
compact
].
compact
}
}
...
@@ -138,7 +138,7 @@ RSpec.shared_context 'group navbar structure' do
...
@@ -138,7 +138,7 @@ RSpec.shared_context 'group navbar structure' do
_
(
'Integrations'
),
_
(
'Integrations'
),
_
(
'Projects'
),
_
(
'Projects'
),
_
(
'Repository'
),
_
(
'Repository'
),
_
(
'CI
/
CD'
),
_
(
'CI
/
CD'
),
_
(
'Packages & Registries'
),
_
(
'Packages & Registries'
),
_
(
'Webhooks'
)
_
(
'Webhooks'
)
]
]
...
...
spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
View file @
676799bf
...
@@ -204,7 +204,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
...
@@ -204,7 +204,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
it
'does not show the ci/cd settings tab'
do
it
'does not show the ci/cd settings tab'
do
render
render
expect
(
rendered
).
not_to
have_link
(
'CI
/
CD'
,
href:
project_settings_ci_cd_path
(
project
))
expect
(
rendered
).
not_to
have_link
(
'CI
/
CD'
,
href:
project_settings_ci_cd_path
(
project
))
end
end
end
end
...
@@ -214,7 +214,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
...
@@ -214,7 +214,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
it
'shows the ci/cd settings tab'
do
it
'shows the ci/cd settings tab'
do
render
render
expect
(
rendered
).
to
have_link
(
'CI
/
CD'
,
href:
project_settings_ci_cd_path
(
project
))
expect
(
rendered
).
to
have_link
(
'CI
/
CD'
,
href:
project_settings_ci_cd_path
(
project
))
end
end
end
end
end
end
...
...
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