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
ce0e18c4
Commit
ce0e18c4
authored
Jul 27, 2020
by
Angelo Gulina
Committed by
Jose Ivan Vargas
Jul 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove heading from Feature Flags section
parent
9a1a4e25
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
13 deletions
+9
-13
ee/app/assets/javascripts/feature_flags/components/feature_flags.vue
...ts/javascripts/feature_flags/components/feature_flags.vue
+4
-12
ee/changelogs/unreleased/9231-remove-page-heading-in-feature-flags-empty-state.yml
...9231-remove-page-heading-in-feature-flags-empty-state.yml
+5
-0
ee/spec/support/helpers/feature_flag_helpers.rb
ee/spec/support/helpers/feature_flag_helpers.rb
+0
-1
No files found.
ee/app/assets/javascripts/feature_flags/components/feature_flags.vue
View file @
ce0e18c4
...
@@ -132,10 +132,6 @@ export default {
...
@@ -132,10 +132,6 @@ export default {
currentlyDisplayedData
()
{
currentlyDisplayedData
()
{
return
this
.
dataForScope
(
this
.
scope
);
return
this
.
dataForScope
(
this
.
scope
);
},
},
shouldRenderTabs
()
{
/* Do not show tabs until after the first request to get the count */
return
this
.
count
[
this
.
scope
]
!==
undefined
;
},
shouldRenderPagination
()
{
shouldRenderPagination
()
{
return
(
return
(
!
this
.
isLoading
&&
!
this
.
isLoading
&&
...
@@ -257,9 +253,9 @@ export default {
...
@@ -257,9 +253,9 @@ export default {
modal-id=
"configure-feature-flags"
modal-id=
"configure-feature-flags"
@
token=
"rotateInstanceId()"
@
token=
"rotateInstanceId()"
/>
/>
<
h3
class=
"page-title with-button
"
>
<
div
class=
"top-area
"
>
{{
s__
(
'
FeatureFlags|Feature Flags
'
)
}}
<navigation-tabs
:tabs=
"tabs"
scope=
"featureflags"
@
onChangeTab=
"onChangeTab"
/>
<div
class=
"
pull-right
"
>
<div
class=
"
nav-controls
"
>
<gl-button
<gl-button
v-if=
"canUserConfigure"
v-if=
"canUserConfigure"
v-gl-modal=
"'configure-feature-flags'"
v-gl-modal=
"'configure-feature-flags'"
...
@@ -280,7 +276,7 @@ export default {
...
@@ -280,7 +276,7 @@ export default {
{{
s__
(
'
FeatureFlags|New feature flag
'
)
}}
{{
s__
(
'
FeatureFlags|New feature flag
'
)
}}
</gl-button>
</gl-button>
</div>
</div>
</
h3
>
</
div
>
<gl-alert
v-if=
"!isUserListAlertDismissed"
@
dismiss=
"isUserListAlertDismissed = true"
>
<gl-alert
v-if=
"!isUserListAlertDismissed"
@
dismiss=
"isUserListAlertDismissed = true"
>
<gl-sprintf
<gl-sprintf
:message=
"
:message=
"
...
@@ -305,10 +301,6 @@ export default {
...
@@ -305,10 +301,6 @@ export default {
{{ message }}
{{ message }}
</gl-alert>
</gl-alert>
<div
v-if=
"shouldRenderTabs"
class=
"top-area scrolling-tabs-container inner-page-scroll-tabs"
>
<navigation-tabs
:tabs=
"tabs"
scope=
"featureflags"
@
onChangeTab=
"onChangeTab"
/>
</div>
<gl-loading-icon
<gl-loading-icon
v-if=
"isLoading"
v-if=
"isLoading"
:label=
"s__('FeatureFlags|Loading feature flags')"
:label=
"s__('FeatureFlags|Loading feature flags')"
...
...
ee/changelogs/unreleased/9231-remove-page-heading-in-feature-flags-empty-state.yml
0 → 100644
View file @
ce0e18c4
---
title
:
Remove heading from Feature Flags section
merge_request
:
37613
author
:
type
:
changed
ee/spec/support/helpers/feature_flag_helpers.rb
View file @
ce0e18c4
...
@@ -81,7 +81,6 @@ module FeatureFlagHelpers
...
@@ -81,7 +81,6 @@ module FeatureFlagHelpers
end
end
def
expect_user_to_see_feature_flags_index_page
def
expect_user_to_see_feature_flags_index_page
expect
(
page
).
to
have_css
(
'h3.page-title'
,
text:
'Feature Flags'
)
expect
(
page
).
to
have_text
(
'Feature Flags'
)
expect
(
page
).
to
have_text
(
'Feature Flags'
)
expect
(
page
).
to
have_text
(
'Lists'
)
expect
(
page
).
to
have_text
(
'Lists'
)
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