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
90e0d25e
Commit
90e0d25e
authored
Jun 22, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make the application settings EE-CE friendly
parent
376fed3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
app/views/admin/application_settings/show.html.haml
app/views/admin/application_settings/show.html.haml
+2
-12
ee/app/views/admin/application_settings/_pseudonymizer_settings.html.haml
...in/application_settings/_pseudonymizer_settings.html.haml
+11
-0
No files found.
app/views/admin/application_settings/show.html.haml
View file @
90e0d25e
...
...
@@ -362,18 +362,6 @@
.settings-content
=
render
partial:
'elasticsearch_form'
-
if
Gitlab
::
CurrentSettings
.
pseudonymizer_can_be_configured?
%section
.settings.as-pseudonymizer.no-animate
#js-pseudonymizer-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
%h4
=
_
(
'Pseudonymizer data collection'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Enable or disable the Pseudonymizer data collection.'
)
.settings-content
=
render
'pseudonymizer'
-
if
Gitlab
.
com?
||
Rails
.
env
.
development?
%section
.settings.as-slack.no-animate
#js-slack-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
...
...
@@ -385,3 +373,5 @@
=
_
(
'Geo allows you to replicate your GitLab instance to other geographical locations.'
)
.settings-content
=
render
partial:
'slack'
=
render_if_exists
'pseudonymizer_settings'
ee/app/views/admin/application_settings/_pseudonymizer_settings.html.haml
0 → 100644
View file @
90e0d25e
-
if
Gitlab
::
CurrentSettings
.
pseudonymizer_can_be_configured?
%section
.settings.as-pseudonymizer.no-animate
#js-pseudonymizer-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
%h4
=
_
(
'Pseudonymizer data collection'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Enable or disable the Pseudonymizer data collection.'
)
.settings-content
=
render
'pseudonymizer'
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