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
a4b43b89
Commit
a4b43b89
authored
Jun 13, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix failing specs
parent
035b9f73
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-3
spec/lib/pseudonymizer/uploader_spec.rb
spec/lib/pseudonymizer/uploader_spec.rb
+2
-2
No files found.
config/gitlab.yml.example
View file @
a4b43b89
...
...
@@ -311,6 +311,7 @@ production: &base
geo_migrated_local_files_clean_up_worker:
cron: "15 */6 * * *"
# Export pseudonymized data in CSV format for analysis
pseudonymizer_worker:
cron: "0 * * * *"
...
...
config/initializers/1_settings.rb
View file @
a4b43b89
...
...
@@ -370,9 +370,9 @@ Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({})
Settings
.
cron_jobs
[
'gitlab_usage_ping_worker'
][
'cron'
]
||=
Settings
.
__send__
(
:cron_for_usage_ping
)
Settings
.
cron_jobs
[
'gitlab_usage_ping_worker'
][
'job_class'
]
=
'GitlabUsagePingWorker'
Settings
.
cron_jobs
[
'pseudonymizer'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'pseudonymizer'
][
'cron'
]
||=
'0 23 * * *'
Settings
.
cron_jobs
[
'pseudonymizer'
][
'job_class'
]
||=
'PseudonymizerWorker'
Settings
.
cron_jobs
[
'pseudonymizer
_worker
'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'pseudonymizer
_worker
'
][
'cron'
]
||=
'0 23 * * *'
Settings
.
cron_jobs
[
'pseudonymizer
_worker
'
][
'job_class'
]
||=
'PseudonymizerWorker'
Settings
.
cron_jobs
[
'schedule_update_user_activity_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'schedule_update_user_activity_worker'
][
'cron'
]
||=
'30 0 * * *'
...
...
spec/lib/pseudonymizer/uploader_spec.rb
View file @
a4b43b89
...
...
@@ -7,7 +7,7 @@ describe Pseudonymizer::Uploader do
config:
YAML
.
load_file
(
Rails
.
root
.
join
(
Gitlab
.
config
.
pseudonymizer
.
manifest
))
)
end
let
(
:remote_directory
)
{
described_class
.
remote_directory
}
let
(
:remote_directory
)
{
subject
.
send
(
:remote_directory
)
}
subject
{
described_class
.
new
(
options
)
}
def
mock_file
(
file_name
)
...
...
@@ -27,7 +27,7 @@ describe Pseudonymizer::Uploader do
it
"upload all file in the directory"
do
subject
.
upload
expect
(
remote_directory
.
files
.
count
).
to
eq
(
12
)
expect
(
remote_directory
.
files
.
all
.
count
).
to
eq
(
12
)
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