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
2b8b54dd
Commit
2b8b54dd
authored
Oct 04, 2018
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds the expandable section for Snowplow on the admin settings page.
parent
9c389410
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
20 deletions
+38
-20
ee/app/views/admin/application_settings/_snowplow.html.haml
ee/app/views/admin/application_settings/_snowplow.html.haml
+30
-20
ee/changelogs/unreleased/7867-snowplow-integration-settings-are-rendered-incorrectly.yml
...nowplow-integration-settings-are-rendered-incorrectly.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/views/admin/application_settings/_snowplow.html.haml
View file @
2b8b54dd
=
form_for
@application_setting
,
url:
admin_application_settings_path
,
html:
{
class:
'fieldset-form'
}
do
|
f
|
%section
.settings.as-snowplow.no-animate
#js-snowplow-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
%h4
Snowplow
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Configure the %{link} integration.'
).
html_safe
%
{
link:
link_to
(
'Snowplow'
,
'https://snowplowanalytics.com/'
,
target:
'_blank'
)
}
.settings-content
=
form_for
@application_setting
,
url:
admin_application_settings_path
,
html:
{
class:
'fieldset-form'
}
do
|
f
|
=
form_errors
(
@application_setting
)
=
form_errors
(
@application_setting
)
%fieldset
%fieldset
...
...
ee/changelogs/unreleased/7867-snowplow-integration-settings-are-rendered-incorrectly.yml
0 → 100644
View file @
2b8b54dd
---
title
:
Adds expandable/collapsable section for Snowplow
merge_request
:
7798
author
:
type
:
other
locale/gitlab.pot
View file @
2b8b54dd
...
@@ -2101,6 +2101,9 @@ msgstr ""
...
@@ -2101,6 +2101,9 @@ msgstr ""
msgid "Configure storage path and circuit breaker settings."
msgid "Configure storage path and circuit breaker settings."
msgstr ""
msgstr ""
msgid "Configure the %{link} integration."
msgstr ""
msgid "Configure the way a user creates a new account."
msgid "Configure the way a user creates a new account."
msgstr ""
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