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
e7415e3e
Commit
e7415e3e
authored
Jun 22, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove the Gitlab.config.pseudonymizer.enabled configuration
parent
52668210
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
5 additions
and
14 deletions
+5
-14
config/gitlab.yml.example
config/gitlab.yml.example
+0
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+0
-1
db/schema.rb
db/schema.rb
+1
-1
doc/administration/pseudonymizer.md
doc/administration/pseudonymizer.md
+0
-2
ee/app/models/ee/application_setting.rb
ee/app/models/ee/application_setting.rb
+2
-6
ee/app/views/admin/application_settings/_pseudonymizer_settings.html.haml
...in/application_settings/_pseudonymizer_settings.html.haml
+1
-1
ee/db/migrate/20180531221734_add_pseudonymizer_enabled_to_application_settings.rb
...1734_add_pseudonymizer_enabled_to_application_settings.rb
+1
-1
No files found.
config/gitlab.yml.example
View file @
e7415e3e
...
@@ -732,7 +732,6 @@ production: &base
...
@@ -732,7 +732,6 @@ production: &base
## Pseudonymizer exporter
## Pseudonymizer exporter
pseudonymizer:
pseudonymizer:
enabled: false
# Tables manifest that specifies the fields to extract and pseudonymize.
# Tables manifest that specifies the fields to extract and pseudonymize.
manifest: config/pseudonymizer.yml
manifest: config/pseudonymizer.yml
upload:
upload:
...
@@ -896,7 +895,6 @@ test:
...
@@ -896,7 +895,6 @@ test:
backup:
backup:
path: tmp/tests/backups
path: tmp/tests/backups
pseudonymizer:
pseudonymizer:
enabled: false
manifest: config/pseudonymizer.yml
manifest: config/pseudonymizer.yml
upload:
upload:
# The remote 'directory' to store the CSV files. For S3, this would be the bucket name.
# The remote 'directory' to store the CSV files. For S3, this would be the bucket name.
...
...
config/initializers/1_settings.rb
View file @
e7415e3e
...
@@ -478,7 +478,6 @@ Settings.backup['upload']['storage_class'] ||= nil
...
@@ -478,7 +478,6 @@ Settings.backup['upload']['storage_class'] ||= nil
# Pseudonymizer
# Pseudonymizer
#
#
Settings
[
'pseudonymizer'
]
||=
Settingslogic
.
new
({})
Settings
[
'pseudonymizer'
]
||=
Settingslogic
.
new
({})
Settings
.
pseudonymizer
[
'enabled'
]
=
false
if
Settings
.
pseudonymizer
[
'enabled'
].
nil?
Settings
.
pseudonymizer
[
'manifest'
]
=
Settings
.
absolute
(
Settings
.
pseudonymizer
[
'manifest'
]
||
Rails
.
root
.
join
(
"config/pseudonymizer.yml"
))
Settings
.
pseudonymizer
[
'manifest'
]
=
Settings
.
absolute
(
Settings
.
pseudonymizer
[
'manifest'
]
||
Rails
.
root
.
join
(
"config/pseudonymizer.yml"
))
Settings
.
pseudonymizer
[
'upload'
]
||=
Settingslogic
.
new
({
'remote_directory'
=>
nil
,
'connection'
=>
nil
})
Settings
.
pseudonymizer
[
'upload'
]
||=
Settingslogic
.
new
({
'remote_directory'
=>
nil
,
'connection'
=>
nil
})
# Settings.pseudonymizer['upload']['multipart_chunk_size'] ||= 104857600
# Settings.pseudonymizer['upload']['multipart_chunk_size'] ||= 104857600
...
...
db/schema.rb
View file @
e7415e3e
...
@@ -206,7 +206,7 @@ ActiveRecord::Schema.define(version: 20180612175636) do
...
@@ -206,7 +206,7 @@ ActiveRecord::Schema.define(version: 20180612175636) do
t
.
string
"encrypted_external_auth_client_key_pass_iv"
t
.
string
"encrypted_external_auth_client_key_pass_iv"
t
.
string
"email_additional_text"
t
.
string
"email_additional_text"
t
.
boolean
"enforce_terms"
,
default:
false
t
.
boolean
"enforce_terms"
,
default:
false
t
.
boolean
"pseudonymizer_enabled"
,
default:
tru
e
,
null:
false
t
.
boolean
"pseudonymizer_enabled"
,
default:
fals
e
,
null:
false
end
end
create_table
"approvals"
,
force: :cascade
do
|
t
|
create_table
"approvals"
,
force: :cascade
do
|
t
|
...
...
doc/administration/pseudonymizer.md
View file @
e7415e3e
...
@@ -30,7 +30,6 @@ To configure the pseudonymizer, you need to:
...
@@ -30,7 +30,6 @@ To configure the pseudonymizer, you need to:
the values you want:
the values you want:
```ruby
```ruby
gitlab_rails['pseudonymizer_enabled'] = true
gitlab_rails['pseudonymizer_manifest'] = 'config/pseudonymizer.yml'
gitlab_rails['pseudonymizer_manifest'] = 'config/pseudonymizer.yml'
gitlab_rails['pseudonymizer_upload_remote_directory'] = 'gitlab-elt'
gitlab_rails['pseudonymizer_upload_remote_directory'] = 'gitlab-elt'
gitlab_rails['pseudonymizer_upload_connection'] = {
gitlab_rails['pseudonymizer_upload_connection'] = {
...
@@ -64,7 +63,6 @@ To configure the pseudonymizer, you need to:
...
@@ -64,7 +63,6 @@ To configure the pseudonymizer, you need to:
```yaml
```yaml
pseudonymizer:
pseudonymizer:
enabled: true
manifest: config/pseudonymizer.yml
manifest: config/pseudonymizer.yml
upload:
upload:
remote_directory: 'gitlab-elt' # The bucket name
remote_directory: 'gitlab-elt' # The bucket name
...
...
ee/app/models/ee/application_setting.rb
View file @
e7415e3e
...
@@ -101,7 +101,7 @@ module EE
...
@@ -101,7 +101,7 @@ module EE
slack_app_id:
nil
,
slack_app_id:
nil
,
slack_app_secret:
nil
,
slack_app_secret:
nil
,
slack_app_verification_token:
nil
,
slack_app_verification_token:
nil
,
pseudonymizer_enabled:
tru
e
pseudonymizer_enabled:
fals
e
)
)
end
end
end
end
...
@@ -110,12 +110,8 @@ module EE
...
@@ -110,12 +110,8 @@ module EE
License
.
feature_available?
(
:pseudonymizer
)
License
.
feature_available?
(
:pseudonymizer
)
end
end
def
pseudonymizer_can_be_configured?
Settings
.
pseudonymizer
.
enabled
&&
pseudonymizer_available?
end
def
pseudonymizer_enabled?
def
pseudonymizer_enabled?
pseudonymizer_
can_be_configured
?
&&
super
pseudonymizer_
available
?
&&
super
end
end
def
should_check_namespace_plan?
def
should_check_namespace_plan?
...
...
ee/app/views/admin/application_settings/_pseudonymizer_settings.html.haml
View file @
e7415e3e
-
if
Gitlab
::
CurrentSettings
.
pseudonymizer_
can_be_configured
?
-
if
Gitlab
::
CurrentSettings
.
pseudonymizer_
available
?
%section
.settings.as-pseudonymizer.no-animate
#js-pseudonymizer-settings
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings.as-pseudonymizer.no-animate
#js-pseudonymizer-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
.settings-header
%h4
%h4
...
...
ee/db/migrate/20180531221734_add_pseudonymizer_enabled_to_application_settings.rb
View file @
e7415e3e
...
@@ -26,6 +26,6 @@ class AddPseudonymizerEnabledToApplicationSettings < ActiveRecord::Migration
...
@@ -26,6 +26,6 @@ class AddPseudonymizerEnabledToApplicationSettings < ActiveRecord::Migration
# disable_ddl_transaction!
# disable_ddl_transaction!
def
change
def
change
add_column
:application_settings
,
:pseudonymizer_enabled
,
:boolean
,
null:
false
,
default:
tru
e
add_column
:application_settings
,
:pseudonymizer_enabled
,
:boolean
,
null:
false
,
default:
fals
e
end
end
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