summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Revert "Add latest changes from gitlab-org/gitlab@12-0-stable-ee"Alessio Caiazza2019-12-1334-1392/+16
* Add latest changes from gitlab-org/gitlab@12-0-stable-eeGitLab Bot2019-12-1334-16/+1392
* Add captcha if there are multiple failed login attemptsMaƂgorzata Ksionek2019-08-261-0/+1
* Merge branch 'security-12-0-enable-image-proxy' into '12-0-stable'GitLab Release Tools Bot2019-08-262-1/+9
|\
| * Add support for using a Camo proxy serverBrett Walker2019-08-152-1/+9
* | Merge branch 'security-ssrf-kubernetes-dns-12-0' into '12-0-stable'GitLab Release Tools Bot2019-08-261-0/+49
|\ \
| * | Override hostname when connecting via KubeclientThong Kuah2019-08-041-0/+49
| |/
* | Add direct upload support for personal snippetsJan Provaznik2019-08-231-0/+4
|/
* Merge branch 'security-github-ssrf-redirect-12-0' into '12-0-stable'GitLab Release Tools Bot2019-07-241-0/+1
|\
| * Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-091-0/+1
* | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-171-5/+1
|/
* Merge branch 'security-prevent-detection-of-merge-request-template-name-12-0'...GitLab Release Tools Bot2019-06-261-1/+4
|\
| * Authorize access before serving project templateLuke Duncalfe2019-06-171-1/+4
* | Merge branch 'security-persist-tmp-snippet-uploads-12-0' into '12-0-stable'GitLab Release Tools Bot2019-06-261-2/+2
|\ \
| * | Persist tmp snippet uploadsOswaldo Ferreira2019-06-171-2/+2
| |/
* | Merge branch 'config-application-differences' into 'master'Lin Jen-Shin2019-06-181-0/+30
|\ \
| * | Backport EE changes to config/application.rbconfig-application-differencesYorick Peterse2019-06-171-0/+30
* | | [skip ci] Update doorkeeper.en.ymlPierre Tardy2019-06-171-1/+1
* | | read_repository scope can be used for APIPierre Tardy2019-06-141-1/+1
|/ /
* | 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
* | 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