summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Add network and graphs to legacy routes toodz-scope-project-routesDmitriy Zaporozhets2019-05-211-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add legacy routes for modified project pathDmitriy Zaporozhets2019-05-211-0/+14
| | | | | | | | | | | | | | | | | | For settings, branches and tags Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move project settings under /-/ scopeDmitriy Zaporozhets2019-05-201-14/+17
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move some project routes under /-/ scopeDmitriy Zaporozhets2019-05-201-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Bump devise to 4.6Utkarsh Gupta2019-05-211-0/+5
| | | | | | | | | | | | Signed-off-by: Utkarsh Gupta <guptautkarsh2102@gmail.com>
* | | Fix typos in the whole gitlab-ce projectYoginth2019-05-202-2/+2
|/ /
* | Replace Unicorn with web server in the init.d script [ci skip]Dmitriy Zaporozhets2019-05-171-0/+70
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove extra ending line from unicorn example filebw-unicorn-extra-lineBrett Walker2019-05-161-1/+0
| |
* | Add Let's Encrypt clientVladimir Shushlin2019-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of adding Let's Encrypt certificates for pages domains Add acme-client gem Client is being initialized by private key stored in secrets.yml Let's Encrypt account is being created lazily. If it's already created, Acme::Client just gets account_kid by calling new_account method Make Let's Encrypt client an instance Wrap order and challenge classes
* | Suppress keychain access popup from chromedriver in KarmaWinnie Hellmann2019-05-151-0/+2
|/
* Merge branch 'explain-artifacts-server-configuration-docs' into 'master'Nick Thomas2019-05-131-1/+1
|\ | | | | | | | | Expain usage of `artifacts_server` in `gitlab.yml` See merge request gitlab-org/gitlab-ce!28230
| * Expain usage of `artifacts_server` in `gitlab.yml`explain-artifacts-server-configuration-docsKrasimir Angelov2019-05-101-1/+1
| | | | | | | | | | | | Add comment to clarify intended usage of `artifacts_server`. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49475.
* | Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu2019-05-111-0/+4
|\ \ | | | | | | | | | | | | Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241
| * | Add EE fixtures to SeedFu pathinclude-ee-fixturesBalasankar "Balu" C2019-05-101-0/+4
| |/ | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
|/ | | | [ci skip]
* Generate Let's Encrypt private keyVladimir Shushlin2019-05-091-1/+6
|
* Remove from providers with iconGosia Ksionek2019-05-071-0/+4
| | | | | | Remove puts Remove puts
* Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-071-1/+4
|\ | | | | | | | | Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport) See merge request gitlab-org/gitlab-ce!28032
| * Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-021-1/+4
| | | | | | | | (cherry picked from commit 7cde57bf7367bce130a2e7f149c8dafd362de3f8)
* | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-071-0/+2
|\ \ | | | | | | | | | | | | Instance level k8s clusters See merge request gitlab-org/gitlab-ce!27196
| * | Instance level kubernetes clusters adminJames Fargher2019-05-071-0/+2
| | | | | | | | | | | | | | | Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* | | Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2Stan Hu2019-05-061-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | If the UI sends a string value for lock_version (e.g. "0"), then the previous monkey patch did not properly handle that properly. This commit casts the value to an integer to determine whether to look for NULL lock_versions. For merge requests, GitLab sends a POST request to `namespace/project/merge_requests/:iid` with the `merge_request[lock_version]` parameter with a string `0`. The string value comes from the form field, which explains why https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't sufficient.
* | Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-061-0/+41
| |
* | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-051-1/+1
| |
* | Include all queries in the performance bar summarySean McGivern2019-05-031-0/+12
|/ | | | | | | | | | | | Rails 5.1's `exec_no_cache` doesn't call `async_exec` any more, but `exec_params`: https://github.com/rails/rails/pull/33188 This means that the DB summary in the performance bar was wrong. The individual query details were still correct (we subscribe to ActiveRecord events for those). We can remove this once the upstream PR to peek-pg is in a release and we update to use that release.
* Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-021-0/+6
| | | | | | | | | | - Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-012-0/+2
|
View Lorry Controller Status