summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-111-1/+1
|\
| * Named route for prometheus proxy_pathSimon Knox2019-06-061-1/+1
* | Add metric for measuring PumaWorkerKiller activityJan Provaznik2019-06-101-1/+0
* | Adds sidekiq worker label for ruby metricsRyan Cobb2019-06-061-6/+0
* | Add pages domains acme ordersVladimir Shushlin2019-06-061-0/+2
|/
* Allow BetterErrors REPL to be enabledashmckenzie/enable-better-errors-replAsh McKenzie2019-06-051-0/+3
* Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-workerShinya Maeda2019-06-041-0/+1
* 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
* | Abstract auto merge processesShinya Maeda2019-06-031-1/+1
* | Merge branch 'dz-scope-project-routes-3' into 'master'Lin Jen-Shin2019-05-311-40/+43
|\ \
| * | Move some project routes under - scopeDmitriy Zaporozhets2019-05-291-40/+43
* | | Send notifications to group-specific email addressWei-Meng Lee2019-05-311-1/+5
* | | Setup Phabricator importBob Van Landuyt2019-05-312-0/+3
* | | Build visual_review_toolbar with webpackSarah Groff Hennigh-Palermo2019-05-291-0/+58
* | | 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
|/ /
* | Add Puma samplerJan Provaznik2019-05-293-1/+10
|/
* Merge branch 'dz-scope-project-routes-2' into 'master'Dmitriy Zaporozhets2019-05-281-98/+101
|\
| * Move some project routes under - scopedz-scope-project-routes-2Dmitriy Zaporozhets2019-05-261-39/+44
| * Move project routes under one scopeDmitriy Zaporozhets2019-05-241-60/+58
* | Store Let's Encrypt private key in settingsVladimir Shushlin2019-05-281-6/+1
|/
* Changes RackAttack logger to use structured logsMayra Cabrera2019-05-242-1/+9
* Merge branch '58869-unified-fe-test-script' into 'master'Clement Ho2019-05-231-5/+21
|\
| * Add empty test suite flag to karma wrapperPaul Slaughter2019-05-131-5/+21
* | Merge branch 'dz-scope-project-routes' into 'master'Stan Hu2019-05-222-15/+32
|\ \
| * | Add network and graphs to legacy routes toodz-scope-project-routesDmitriy Zaporozhets2019-05-211-1/+1
| * | Add legacy routes for modified project pathDmitriy Zaporozhets2019-05-211-0/+14
| * | Move project settings under /-/ scopeDmitriy Zaporozhets2019-05-201-14/+17
| * | Move some project routes under /-/ scopeDmitriy Zaporozhets2019-05-201-1/+1
* | | Bump devise to 4.6Utkarsh Gupta2019-05-211-0/+5
* | | 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
* | 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
* | 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`explain-artifacts-server-configuration-docsKrasimir Angelov2019-05-101-1/+1
* | Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu2019-05-111-0/+4
|\ \
| * | Add EE fixtures to SeedFu pathinclude-ee-fixturesBalasankar "Balu" C2019-05-101-0/+4
| |/
* | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
|/
* Generate Let's Encrypt private keyVladimir Shushlin2019-05-091-1/+6
* Remove from providers with iconGosia Ksionek2019-05-071-0/+4
* Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-071-1/+4
|\
| * Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-021-1/+4
* | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-071-0/+2
|\ \
| * | Instance level kubernetes clusters adminJames Fargher2019-05-071-0/+2
* | | Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2Stan Hu2019-05-061-1/+5
|/ /
* | 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