diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-06 18:49:40 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-06 18:49:40 +0200 |
| commit | 9362f5939710bba322008aabd37a4962ddae6f2f (patch) | |
| tree | 2c4cea2adfaa170732061c1710dfe74c4e8777b8 /config | |
| parent | 163e9f99ab29524bca204fbd0d0aabc1a1813e4a (diff) | |
| parent | 46e4ed6bd0c8c256bce6d35b4bb992d77fd09971 (diff) | |
| download | gitlab-ce-9362f5939710bba322008aabd37a4962ddae6f2f.tar.gz | |
Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into feature/multi-level-container-registry-imagesfeature/multi-level-container-registry-images
* commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits)
Award emoji button smiley animation
Introduced empty/error UX states to environments monitoring.
Github import rake task
Remove individual modal width styles
Fix RuboCop for removing index
Link to docs site for file in doc/
Disable invalid service templates (again)
Show CI status as Favicon on Pipelines, Job and MR pages
STL file viewer
Wait for the PDF to be loaded before doing anything
remove unnecessary lease as cron job
Search for opened MRs - include reopened MRs
ProjectsFinder should handle more options
Clearly show who triggered the pipeline in email
Make it possible to preview pipeline success/failed emails
Add remove_concurrent_index to database helper
Add more tests for subgroups feature
Large features by the 1st, small ones by the 3rd
Ask people to create EE MRs on the 7th
fix project authorizations migration issue
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index e8fef0000c1..f7cae84088e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -349,6 +349,9 @@ Settings.cron_jobs['trending_projects_worker']['job_class'] = 'TrendingProjectsW Settings.cron_jobs['remove_unreferenced_lfs_objects_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['cron'] ||= '20 0 * * *' Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['job_class'] = 'RemoveUnreferencedLfsObjectsWorker' +Settings.cron_jobs['stuck_import_jobs_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['stuck_import_jobs_worker']['cron'] ||= '15 * * * *' +Settings.cron_jobs['stuck_import_jobs_worker']['job_class'] = 'StuckImportJobsWorker' # # GitLab Shell diff --git a/config/webpack.config.js b/config/webpack.config.js index 69d8c5640f7..dc431e4d566 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -42,6 +42,7 @@ var config = { profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', snippet: './snippet/snippet_bundle.js', + stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', u2f: ['vendor/u2f'], users: './users/users_bundle.js', |