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
1c16cdec
Commit
1c16cdec
authored
Jun 19, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a problem with table_to_csv caching
parent
184f612d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
ee/app/views/admin/application_settings/_pseudonymizer.html.haml
...views/admin/application_settings/_pseudonymizer.html.haml
+1
-3
lib/pseudonymizer/dumper.rb
lib/pseudonymizer/dumper.rb
+1
-1
lib/tasks/gitlab/db.rake
lib/tasks/gitlab/db.rake
+2
-2
No files found.
app/views/admin/application_settings/_pseudonymizer.html.haml
→
ee/
app/views/admin/application_settings/_pseudonymizer.html.haml
View file @
1c16cdec
...
@@ -5,10 +5,9 @@
...
@@ -5,10 +5,9 @@
.form-group.row
.form-group.row
.offset-sm-2.col-sm-10
.offset-sm-2.col-sm-10
-
is_enabled
=
@application_setting
.
pseudonymizer_enabled?
-
is_enabled
=
@application_setting
.
pseudonymizer_enabled?
-
is_available
=
@application_setting
.
pseudonymizer_available?
.form-check
.form-check
=
f
.
label
:pseudonymizer_enabled
do
=
f
.
label
:pseudonymizer_enabled
do
=
f
.
check_box
:pseudonymizer_enabled
,
disabled:
!
is_available
=
f
.
check_box
:pseudonymizer_enabled
Enable Pseudonymizer Cron Job
Enable Pseudonymizer Cron Job
.form-text.text-muted
.form-text.text-muted
-
if
is_enabled
-
if
is_enabled
...
@@ -17,4 +16,3 @@
...
@@ -17,4 +16,3 @@
=
pseudonymizer_disabled_description_text
=
pseudonymizer_disabled_description_text
=
f
.
submit
'Save changes'
,
class:
"btn btn-success"
=
f
.
submit
'Save changes'
,
class:
"btn btn-success"
lib/pseudonymizer/dumper.rb
View file @
1c16cdec
...
@@ -109,7 +109,7 @@ module Pseudonymizer
...
@@ -109,7 +109,7 @@ module Pseudonymizer
end
end
def
tables_to_csv
def
tables_to_csv
return
@output_files
if
@output_files
return
@output_files
unless
@output_files
.
empty?
tables
=
config
[
:tables
]
tables
=
config
[
:tables
]
FileUtils
.
mkdir_p
(
output_dir
)
unless
File
.
directory?
(
output_dir
)
FileUtils
.
mkdir_p
(
output_dir
)
unless
File
.
directory?
(
output_dir
)
...
...
lib/tasks/gitlab/db.rake
View file @
1c16cdec
...
@@ -72,8 +72,8 @@ namespace :gitlab do
...
@@ -72,8 +72,8 @@ namespace :gitlab do
desc
'Output pseudonymity dump of selected tables'
desc
'Output pseudonymity dump of selected tables'
task
pseudonymizer: :environment
do
task
pseudonymizer: :environment
do
#
abort "The pseudonymizer is not available with this license." unless License.feature_available?(:pseudonymizer)
abort
"The pseudonymizer is not available with this license."
unless
License
.
feature_available?
(
:pseudonymizer
)
#
abort "The pseudonymizer is disabled." unless Gitlab::CurrentSettings.pseudonymizer_enabled?
abort
"The pseudonymizer is disabled."
unless
Gitlab
::
CurrentSettings
.
pseudonymizer_enabled?
options
=
Pseudonymizer
::
Options
.
new
(
options
=
Pseudonymizer
::
Options
.
new
(
config:
YAML
.
load_file
(
Gitlab
.
config
.
pseudonymizer
.
manifest
),
config:
YAML
.
load_file
(
Gitlab
.
config
.
pseudonymizer
.
manifest
),
...
...
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