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
7a1b718a
Commit
7a1b718a
authored
Apr 14, 2020
by
Jose Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change feature flag name
Also reused non namespaced strings
parent
d713a50c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
...projects/shared/permissions/components/settings_panel.vue
+5
-6
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
...ects/shared/permissions/components/settings_panel_spec.js
+2
-2
No files found.
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
View file @
7a1b718a
...
...
@@ -193,8 +193,8 @@ export default {
);
},
metric
VisibilityToggle
Available
()
{
return
gon
.
features
?.
metrics
VisibilityTogg
le
;
metric
sDashboardVisibilitySwitching
Available
()
{
return
gon
.
features
?.
metrics
DashboardVisibilitySwitchingAvailab
le
;
},
},
...
...
@@ -470,9 +470,9 @@ export default {
/>
</project-setting-row>
<project-setting-row
v-if=
"metric
VisibilityToggle
Available"
v-if=
"metric
sDashboardVisibilitySwitching
Available"
ref=
"metrics-visibility-settings"
:label=
"
s__('ProjectSettings|
Metrics Dashboard')"
:label=
"
__('
Metrics Dashboard')"
:help-text=
"
s__(
'ProjectSettings|With Metrics Dashboard you can visualize this project performance metrics',
...
...
@@ -483,8 +483,7 @@ export default {
<div
class=
"select-wrapper"
>
<select
v-model=
"metricsAccessLevel"
:disabled=
"false"
name=
"project[project_feature_attributes][metrics_access_level]"
name=
"project[project_feature_attributes][metrics_dashboard_access_level]"
class=
"form-control select-control"
>
<option
...
...
app/controllers/projects_controller.rb
View file @
7a1b718a
...
...
@@ -37,7 +37,7 @@ class ProjectsController < Projects::ApplicationController
layout
:determine_layout
before_action
do
push_frontend_feature_flag
(
:metrics_
visibility_togg
le
)
push_frontend_feature_flag
(
:metrics_
dashboard_visibility_switching_availab
le
)
end
def
index
...
...
locale/gitlab.pot
View file @
7a1b718a
...
...
@@ -15955,9 +15955,6 @@ msgstr ""
msgid "ProjectSettings|Merge suggestions"
msgstr ""
msgid "ProjectSettings|Metrics Dashboard"
msgstr ""
msgid "ProjectSettings|No merge commits are created"
msgstr ""
...
...
spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
View file @
7a1b718a
...
...
@@ -68,7 +68,7 @@ describe('Settings Panel', () => {
wrapper
=
mountComponent
();
gon
.
features
=
gon
.
features
||
{};
gon
.
features
.
metrics
VisibilityTogg
le
=
true
;
gon
.
features
.
metrics
DashboardVisibilitySwitchingAvailab
le
=
true
;
});
afterEach
(()
=>
{
...
...
@@ -484,7 +484,7 @@ describe('Settings Panel', () => {
it
(
'
should set the visibility level description based upon the selected visibility level
'
,
()
=>
{
wrapper
.
find
(
'
[name="project[project_feature_attributes][metrics_access_level]"]
'
)
.
find
(
'
[name="project[project_feature_attributes][metrics_
dashboard_
access_level]"]
'
)
.
setValue
(
visibilityOptions
.
PUBLIC
);
expect
(
wrapper
.
vm
.
metricsAccessLevel
).
toBe
(
visibilityOptions
.
PUBLIC
);
...
...
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