summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Refactor inside_transaction? to Gitlab::DatabaseAndrew Newdigate2019-06-251-1/+1
| | | | | | | This is a small change to move AfterCommitQueue.inside_transaction? to Gitlab::Database.inside_transaction? Since this change is required by different changes which may not arrive in sequence, it's easier to extract this change out on it's own.
* Renew Let's Encrypt certificatesVladimir Shushlin2019-06-242-0/+5
| | | | | | | | Add index for pages domain ssl auto renewal Add PagesDomain.needs_ssl_renewal scope Add cron worker for ssl renewal Add worker for ssl renewal Add pages ssl renewal worker queues settings
* Merge branch 'bw-issue-reorder' into 'master'Kamil Trzciński2019-06-211-0/+1
|\ | | | | | | | | Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
| * Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-211-0/+1
| | | | | | | | to support manual sorting on the frontend
* | Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-207-3/+252
|\ \ | | | | | | | | | | | | Backport changes made by EE to various YAML configuration files See merge request gitlab-org/gitlab-ce!29606
| * | Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-203-1/+217
| | | | | | | | | | | | | | | | | | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails.
| * | Backport Prometheus YAML config from EEYorick Peterse2019-06-201-2/+2
| | |
| * | Backport Sidekiq queue names from EEYorick Peterse2019-06-201-0/+17
| | |
| * | Backport dependency decisions from EEYorick Peterse2019-06-191-0/+7
| | |
| * | Backport EE YAML settings for PostgreSQLYorick Peterse2019-06-191-0/+9
| | |
* | | Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' ↵Sean McGivern2019-06-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Errors in application settings panel shows wrong panel See merge request gitlab-org/gitlab-ce!25434
| * | | Update application settings using correct actionBrett Walker2019-06-191-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Updating multiple application settings panels through a single action causes the incorrect action to be shown when there are errors. Instead, make each panel action handle both updating and display.
* | | Only support postgresqlNick Thomas2019-06-191-0/+4
|/ / | | | | | | MySQL support has been removed
* | Removes database.yml.example file from config/removes-database-yml-exampleMayra Cabrera2019-06-181-0/+0
|/ | | | | It's an empty file that was committed by accident on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28565
* Merge branch 'dz-remove-deprecated-group-routes' into 'master'Grzegorz Bizon2019-06-181-8/+0
|\ | | | | | | | | Remove deprecated group routes See merge request gitlab-org/gitlab-ce!29351
| * Remove deprecated group routesdz-remove-deprecated-group-routesDmitriy Zaporozhets2019-06-141-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'bootstrap-to-glui' into 'master'Filipa Lacerda2019-06-181-0/+1
|\ \ | | | | | | | | | | | | Import bootstrap styles from gitlab-ui See merge request gitlab-org/gitlab-ce!26165
| * | Import bootstrap styles from gitlab-uiSimon Knox2019-06-171-0/+1
| | | | | | | | | | | | | | | Use gitlab_ui.scss instead of all the bootstrap imports Allow the ../node_modules path from gitlab_ui.scss to resolve
* | | Merge branch 'config-application-differences' into 'master'Lin Jen-Shin2019-06-181-0/+30
|\ \ \ | |/ / |/| | | | | | | | Backport EE changes to config/application.rb See merge request gitlab-org/gitlab-ce!29557
| * | Backport EE changes to config/application.rbconfig-application-differencesYorick Peterse2019-06-171-0/+30
| |/ | | | | | | | | | | This backports the EE changes made to this config file to CE. EE specific bits do not need an `if Gitlab.ee?`, as everything will work transparently when using CE.
* | [skip ci] Update doorkeeper.en.ymlPierre Tardy2019-06-171-1/+1
| |
* | read_repository scope can be used for APIPierre Tardy2019-06-141-1/+1
|/ | | | | | as per documentation https://docs.gitlab.com/ee/api/repository_files.html You can use read_repository to access repository_file API. Not sure about write_repository as it is new and not documented in that page.
* Add back sidekiq metrics exporterrc/add_back_sidekiq_exporterRyan Cobb2019-06-131-0/+6
|
* Moved RackTimeout observer to a different locationJan Provaznik2019-06-121-1/+1
| | | | | Because there will be similar observer for PumaWorkerKiller, it makes sense to keep both on better place.
* Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-111-1/+1
|\ | | | | | | | | Update server API to enable switch prometheus endpoint See merge request gitlab-org/gitlab-ce!29186
| * Named route for prometheus proxy_pathSimon Knox2019-06-061-1/+1
| |
* | Add metric for measuring PumaWorkerKiller activityJan Provaznik2019-06-101-1/+0
| | | | | | | | | | | | PumaWorkerKiller is used for periodically checking and killing workers (the biggest one) if overall memory reaches specified limit. This metric allows us to watch number of killed workers.
* | Adds sidekiq worker label for ruby metricsRyan Cobb2019-06-061-6/+0
| |
* | Add pages domains acme ordersVladimir Shushlin2019-06-061-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | Extract acme double to helper Create ACME challanges for pages domains * Create order & challange through API * save them to database * request challenge validation We're saving order and challenge as one entity, that wouldn't be correct if we would order certificates for several domains simultaneously, but we always order certificate per domain Add controller for processing acme challenges redirected from pages Don't save acme challenge url - we don't use it Validate acme challenge attributes Encrypt private_key in acme orders
* Allow BetterErrors REPL to be enabledashmckenzie/enable-better-errors-replAsh McKenzie2019-06-051-0/+3
| | | | | | This allows the BetterErrors REPL to be available when your GitLab instance is listening on something _other_ than localhost.
* Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-workerShinya Maeda2019-06-041-0/+1
| | | | | As we have a central domain for auto merge process today, we should use a single worker for any auto merge process.
* Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-032-3/+52
|\
| * Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-302-3/+52
| | | | | | | | | | | | Gitlab::HTTP now resolves the hostname only once, verifies the IP is not blocked, and then uses the same IP to perform the actual request, while passing the original hostname in the `Host` header and SSL SNI field.
* | Abstract auto merge processesShinya Maeda2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* | Merge branch 'dz-scope-project-routes-3' into 'master'Lin Jen-Shin2019-05-311-40/+43
|\ \ | | | | | | | | | | | | Move some project routes under - scope See merge request gitlab-org/gitlab-ce!28830
| * | Move some project routes under - scopeDmitriy Zaporozhets2019-05-291-40/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected project routes are: * services * boards * releases * forks * group_links * import * avatar * labels * milestones Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Send notifications to group-specific email addressWei-Meng Lee2019-05-311-1/+5
| | | | | | | | | | | | | | | | | | - Select notification email by walking up group/subgroup path - Add settings UI to set group email notification address - Add tests
* | | Setup Phabricator importBob Van Landuyt2019-05-312-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets up all the basics for importing Phabricator tasks into GitLab issues. To import all tasks from a Phabricator instance into GitLab, we'll import all of them into a new project that will have its repository disabled. The import is hooked into a regular ProjectImport setup, but similar to the GitHub parallel importer takes care of all the imports itself. In this iteration, we're importing each page of tasks in a separate sidekiq job. The first thing we do when requesting a new page of tasks is schedule the next page to be imported. But to avoid deadlocks, we only allow a single job per worker type to run at the same time. For now we're only importing basic Issue information, this should be extended to richer information.
* | | Build visual_review_toolbar with webpackSarah Groff Hennigh-Palermo2019-05-291-0/+58
| | | | | | | | | | | | It takes a lot of lines to move a script
* | | Redirect to admin projects index if project was deleted from admin pageLuke Picciau2019-05-291-1/+1
| | |
* | | Added rack-timeout for PumaJan Provaznik2019-05-291-0/+23
|/ / | | | | | | | | | | | | It assures that requests are aborted after 60 seconds, otherwise an exception is raised. This exception is logged by Sentry, also there is a Prometheus counter for measuring number of requests in each state.
* | Add Puma samplerJan Provaznik2019-05-293-1/+10
|/ | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then.
* Merge branch 'dz-scope-project-routes-2' into 'master'Dmitriy Zaporozhets2019-05-281-98/+101
|\ | | | | | | | | Move more project routes under /-/ scope See merge request gitlab-org/gitlab-ce!28717
| * Move some project routes under - scopedz-scope-project-routes-2Dmitriy Zaporozhets2019-05-261-39/+44
| | | | | | | | | | | | | | | | | | | | | | Affected routes are: * autocomplete_sources * project_members * deploy_keys * deploy_tokens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move project routes under one scopeDmitriy Zaporozhets2019-05-241-60/+58
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Store Let's Encrypt private key in settingsVladimir Shushlin2019-05-281-6/+1
|/ | | | | | | | | | | | | | | | Storing this key in secrets.yml was a bad idea, it would require users using HA setups to manually replicate secrets across nodes during update, it also needed support from omnibus package * Revert "Generate Let's Encrypt private key" This reverts commit 444959bfa0b79e827a2a1a7a314acac19390f976. * Add Let's Encrypt private key to settings as encrypted attribute * Generate Let's Encrypt private key in database migration
* Changes RackAttack logger to use structured logsMayra Cabrera2019-05-242-1/+9
| | | | | | | | Creates a new filename to register auth logs. This change should allow SRE's queries to make better queries through logging infrastructure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54528
* Merge branch '58869-unified-fe-test-script' into 'master'Clement Ho2019-05-231-5/+21
|\ | | | | | | | | | | | | Create a unified script to run Jest & Karma tests Closes #58869 See merge request gitlab-org/gitlab-ce!27239
| * Add empty test suite flag to karma wrapperPaul Slaughter2019-05-131-5/+21
| | | | | | | | | | | | | | This is already supported karma feature, but it wasn't respected because our wrapper threw an error no matter what. https://github.com/karma-runner/karma/blob/fe9a1dd13b5eb3969f9e08acbce020e2a382fd9e/lib/cli.js#L201
* | Merge branch 'dz-scope-project-routes' into 'master'Stan Hu2019-05-222-15/+32
|\ \ | | | | | | | | | | | | Move some project routes under /-/ scope See merge request gitlab-org/gitlab-ce!28435
View Lorry Controller Status