Commit e7415e3e authored by Micaël Bergeron's avatar Micaël Bergeron

remove the Gitlab.config.pseudonymizer.enabled configuration

parent 52668210
...@@ -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.
......
...@@ -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
......
...@@ -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: true, null: false t.boolean "pseudonymizer_enabled", default: false, null: false
end end
create_table "approvals", force: :cascade do |t| create_table "approvals", force: :cascade do |t|
......
...@@ -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
......
...@@ -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: true pseudonymizer_enabled: false
) )
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?
......
- 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
......
...@@ -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: true add_column :application_settings, :pseudonymizer_enabled, :boolean, null: false, default: false
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment