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
3ecce7b8
Commit
3ecce7b8
authored
Oct 24, 2019
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move pendo implementation to ee only
- should not be part of FOSS as per our guidelines
parent
7c4bc9d1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
24 deletions
+2
-24
app/views/admin/application_settings/integrations.html.haml
app/views/admin/application_settings/integrations.html.haml
+1
-1
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+1
-1
ee/app/views/admin/application_settings/_pendo.html.haml
ee/app/views/admin/application_settings/_pendo.html.haml
+0
-0
ee/app/views/layouts/_pendo.html.haml
ee/app/views/layouts/_pendo.html.haml
+0
-0
spec/views/layouts/_head.html.haml_spec.rb
spec/views/layouts/_head.html.haml_spec.rb
+0
-22
No files found.
app/views/admin/application_settings/integrations.html.haml
View file @
3ecce7b8
...
...
@@ -29,4 +29,4 @@
=
render
'third_party_offers'
,
application_setting:
@application_setting
=
render
'admin/application_settings/snowplow'
,
expanded:
expanded_by_default?
=
render
'admin/application_settings/pendo'
=
render
_if_exists
'admin/application_settings/pendo'
app/views/layouts/_head.html.haml
View file @
3ecce7b8
...
...
@@ -90,4 +90,4 @@
=
render
'layouts/google_analytics'
if
extra_config
.
has_key?
(
'google_analytics_id'
)
=
render
'layouts/piwik'
if
extra_config
.
has_key?
(
'piwik_url'
)
&&
extra_config
.
has_key?
(
'piwik_site_id'
)
=
render
'layouts/snowplow'
=
render
'layouts/pendo'
=
render
_if_exists
'layouts/pendo'
app/views/admin/application_settings/_pendo.html.haml
→
ee/
app/views/admin/application_settings/_pendo.html.haml
View file @
3ecce7b8
File moved
app/views/layouts/_pendo.html.haml
→
ee/
app/views/layouts/_pendo.html.haml
View file @
3ecce7b8
File moved
spec/views/layouts/_head.html.haml_spec.rb
View file @
3ecce7b8
...
...
@@ -92,28 +92,6 @@ describe 'layouts/_head' do
end
end
context
'when pendo is enabled'
do
it
'adds a pendo initialization snippet with url'
,
:aggregate_failures
do
allow
(
Gitlab
::
CurrentSettings
).
to
receive
(
:pendo_enabled?
).
and_return
(
true
)
allow
(
Gitlab
::
CurrentSettings
).
to
receive
(
:pendo_url
).
and_return
(
'www.pen.do'
)
render
expect
(
rendered
).
to
match
(
'pendo.initialize'
)
expect
(
rendered
).
to
match
(
'www.pen.do'
)
end
end
context
'when pendo is not enabled'
do
it
'do not add pendo snippet'
do
allow
(
Gitlab
::
CurrentSettings
).
to
receive
(
:pendo_enabled?
).
and_return
(
false
)
render
expect
(
rendered
).
not_to
match
(
'pendo.initialize'
)
end
end
context
'when a Piwik config is set'
do
let
(
:piwik_host
)
{
'piwik.example.com'
}
...
...
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