summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge branch 'winh-binary-fixture-path' into 'master'Phil Hughes2019-05-011-1/+1
|\ | | | | | | | | Use FIXTURES_PATH constant for binary fixtures in frontend tests See merge request gitlab-org/gitlab-ce!27891
| * Use FIXTURES_PATH for loading test.pdfWinnie Hellmann2019-04-301-1/+1
| |
| * Use FIXTURES_PATH in balsamiq_viewer_integration_spec.jsWinnie Hellmann2019-04-301-1/+1
| |
* | Merge branch 'feat/sentry-environment' into 'master'Douglas Barbosa Alexandre2019-04-303-0/+16
|\ \ | | | | | | | | | | | | feat: add option to define the Sentry Environment See merge request gitlab-org/gitlab-ce!27091
| * | feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-303-0/+16
| | |
* | | Merge branch '60965-referencing-issues-or-epics-by-url-fails-with-404' into ↵Douglas Barbosa Alexandre2019-04-301-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Referencing issues or epics by URL fails with 404" Closes #61099 and #60965 See merge request gitlab-org/gitlab-ce!27827
| * | Don't allow a relative_url_root of '/'Sean McGivern2019-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fail in a few ways: 1. We might end up having a path (not a URL) starting with `//`, which will be interpreted by browsers as a protocol-relative URL. 2. Issue, MR, snippet, etc. reference parsing will look for URLs at `http://gitlab.example.com//project/...`, with the double slash preventing single slashes from working. In general, it doesn't seem like there's a valid case for this.
* | | Remove disabled pages domainsVladimir Shushlin2019-04-301-0/+4
| |/ |/| | | | | | | Domain will be removed by verification worker after 1 week of being disabled
* | DELETE clusters/:id/:application endpointThong Kuah2019-04-291-0/+1
| | | | | | | | Add endpoint to delete/uninstall a cluster application
* | Merge branch ↵Ash McKenzie2019-04-301-1/+0
|\ \ | |/ |/| | | | | | | | | | | | | '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master' Delete leftover code for referenced_merge_requests endpoint Closes #60476 See merge request gitlab-org/gitlab-ce!27335
| * Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varianFatih Acet2019-04-151-1/+0
| | | | | | | | | | | | | | We rewrote Related MRs widget using Vue. The previous implementation was using Haml templates and calling referenced_merge_requests endpoint which is now deprecated. This MR deletes leftover stuff them.
View Lorry Controller Status