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
e721427a
Commit
e721427a
authored
Jan 17, 2022
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feedback link in discover security point
Changelog: removed EE: true
parent
092feebd
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
4 additions
and
56 deletions
+4
-56
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+0
-1
ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue
...cripts/vue_shared/discover/card_security_discover_app.vue
+0
-21
ee/app/assets/javascripts/vue_shared/discover/card_security_discover_bundle.js
...ipts/vue_shared/discover/card_security_discover_bundle.js
+0
-2
ee/app/assets/stylesheets/page_bundles/security_discover.scss
...pp/assets/stylesheets/page_bundles/security_discover.scss
+0
-7
ee/app/helpers/groups/security_features_helper.rb
ee/app/helpers/groups/security_features_helper.rb
+1
-2
ee/app/helpers/projects/security/discover_helper.rb
ee/app/helpers/projects/security/discover_helper.rb
+1
-2
ee/spec/frontend/vue_shared/discover/card_security_discover_app_spec.js
...nd/vue_shared/discover/card_security_discover_app_spec.js
+0
-14
ee/spec/helpers/groups/security_features_helper_spec.rb
ee/spec/helpers/groups/security_features_helper_spec.rb
+1
-2
ee/spec/helpers/projects/security/discover_helper_spec.rb
ee/spec/helpers/projects/security/discover_helper_spec.rb
+1
-2
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
e721427a
...
...
@@ -881,7 +881,6 @@ $security-and-compliance-carousel-image-carousel-width: 1000px;
$security-and-compliance-carousel-image-discover-button-width
:
45%
;
$security-and-compliance-carousel-image-discover-buttons-max-width
:
280px
;
$security-and-compliance-carousel-image-discover-footer-max-width
:
500px
;
$security-and-compliance-carousel-image-discover-feedback-width
:
30%
;
$security-and-compliance-carousel-image-discover-text-carousel-max-width
:
650px
;
$security-and-compliance-carousel-image-discover-text-carousel-caption-height
:
100%
;
$security-and-compliance-carousel-image-discover-text-carousel-caption-max-width
:
500px
;
...
...
ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue
View file @
e721427a
...
...
@@ -50,11 +50,6 @@ export default {
required
:
false
,
default
:
''
,
},
linkFeedback
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
data
()
{
return
{
...
...
@@ -90,7 +85,6 @@ export default {
discoverTitle
:
s__
(
'
Discover|Security capabilities, integrated into your development lifecycle
'
,
),
discoverFeedbackLabel
:
s__
(
'
Discover|Send feedback
'
),
discoverUpgradeLabel
:
s__
(
'
Discover|Upgrade now
'
),
discoverTrialLabel
:
s__
(
'
Discover|Start a free trial
'
),
carouselCaptions
:
[
...
...
@@ -189,20 +183,5 @@ export default {
{{ $options.i18n.discoverTrialLabel }}
</gl-button>
</div>
<div
id=
"tooltipcontainer"
class=
"discover-feedback gl-fixed"
>
<gl-button
class=
"discover-button-feedback"
category=
"secondary"
variant=
"default"
target=
"_blank"
rel=
"noopener noreferrer"
data-track-action=
"click_button"
data-track-label=
"security-discover-feedback-cta"
:data-track-property=
"slide"
:href=
"linkFeedback"
>
{{ $options.i18n.discoverFeedbackLabel }}
</gl-button>
</div>
</div>
</template>
ee/app/assets/javascripts/vue_shared/discover/card_security_discover_bundle.js
View file @
e721427a
...
...
@@ -11,7 +11,6 @@ export default () => {
projectName
,
linkMain
,
linkSecondary
,
linkFeedback
,
namespaceId
,
userName
,
firstName
,
...
...
@@ -30,7 +29,6 @@ export default () => {
},
linkMain
,
linkSecondary
,
linkFeedback
,
};
return
new
Vue
({
...
...
ee/app/assets/stylesheets/page_bundles/security_discover.scss
View file @
e721427a
...
...
@@ -42,13 +42,6 @@
max-width
:
$security-and-compliance-carousel-image-discover-footer-max-width
;
}
.discover-feedback
{
width
:
$security-and-compliance-carousel-image-discover-feedback-width
;
bottom
:
$gl-spacing-scale-5
;
right
:
$gl-spacing-scale-5
;
text-align
:
right
;
}
.discover-text-carousel
{
max-width
:
$security-and-compliance-carousel-image-discover-text-carousel-max-width
;
...
...
ee/app/helpers/groups/security_features_helper.rb
View file @
e721427a
...
...
@@ -46,8 +46,7 @@ module Groups::SecurityFeaturesHelper
},
link:
{
main:
new_trial_registration_path
(
glm_source:
'gitlab.com'
,
glm_content:
content
),
secondary:
group_billings_path
(
group
.
root_ancestor
,
source:
content
),
feedback:
'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
secondary:
group_billings_path
(
group
.
root_ancestor
,
source:
content
)
}
}
...
...
ee/app/helpers/projects/security/discover_helper.rb
View file @
e721427a
...
...
@@ -19,8 +19,7 @@ module Projects::Security::DiscoverHelper
},
link:
{
main:
new_trial_registration_path
(
glm_source:
'gitlab.com'
,
glm_content:
content
),
secondary:
link_upgrade
,
feedback:
'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
secondary:
link_upgrade
}
}
...
...
ee/spec/frontend/vue_shared/discover/card_security_discover_app_spec.js
View file @
e721427a
...
...
@@ -22,7 +22,6 @@ describe('Card security discover app', () => {
},
linkMain
:
'
/link/main
'
,
linkSecondary
:
'
/link/secondary
'
,
linkFeedback
:
'
link/feedback
'
,
};
wrapper
=
mountFn
(
CardSecurityDiscoverApp
,
{
localVue
,
...
...
@@ -59,10 +58,6 @@ describe('Card security discover app', () => {
);
});
it
(
'
renders discover feedback link properly
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.discover-button-feedback
'
).
html
()).
toContain
(
'
Send feedback
'
);
});
it
(
'
renders discover upgrade links properly
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.discover-button-upgrade
'
).
html
()).
toContain
(
'
Upgrade now
'
);
});
...
...
@@ -107,15 +102,6 @@ describe('Card security discover app', () => {
property
:
'
sliding0-1
'
,
});
});
it
(
'
tracks an event when clicked on feedback
'
,
()
=>
{
wrapper
.
find
(
'
.discover-button-feedback
'
).
trigger
(
'
click
'
);
expect
(
spy
).
toHaveBeenCalledWith
(
'
_category_
'
,
'
click_button
'
,
{
label
:
'
security-discover-feedback-cta
'
,
property
:
'
0
'
,
});
});
});
});
describe
(
'
Experiment pql_three_cta_test
'
,
()
=>
{
...
...
ee/spec/helpers/groups/security_features_helper_spec.rb
View file @
e721427a
...
...
@@ -102,8 +102,7 @@ RSpec.describe Groups::SecurityFeaturesHelper do
},
link:
{
main:
new_trial_registration_path
(
glm_source:
'gitlab.com'
,
glm_content:
content
),
secondary:
group_billings_path
(
group
.
root_ancestor
,
source:
content
),
feedback:
'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
secondary:
group_billings_path
(
group
.
root_ancestor
,
source:
content
)
}
}.
merge
(
helper
.
hand_raise_props
(
group
.
root_ancestor
))
end
...
...
ee/spec/helpers/projects/security/discover_helper_spec.rb
View file @
e721427a
...
...
@@ -17,8 +17,7 @@ RSpec.describe Projects::Security::DiscoverHelper do
},
link:
{
main:
new_trial_registration_path
(
glm_source:
'gitlab.com'
,
glm_content:
content
),
secondary:
profile_billings_path
(
project
.
group
,
source:
content
),
feedback:
'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
secondary:
profile_billings_path
(
project
.
group
,
source:
content
)
}
}.
merge
(
helper
.
hand_raise_props
(
project
.
root_ancestor
))
end
...
...
locale/gitlab.pot
View file @
e721427a
...
...
@@ -12536,9 +12536,6 @@ msgstr ""
msgid "Discover|See the other features of the %{linkStart}ultimate plan%{linkEnd}"
msgstr ""
msgid "Discover|Send feedback"
msgstr ""
msgid "Discover|Start a free trial"
msgstr ""
...
...
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