summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into multi-file-editor-dirty-diff-indicatorPhil Hughes2017-11-301-0/+1
|\
| * BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-281-0/+1
* | fixed web worker performancePhil Hughes2017-11-281-0/+4
|/
* Update svg external dependencyfl-upgrade-svgFilipa Lacerda2017-11-241-2/+2
* Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'Douwe Maan2017-11-242-9/+8
|\
| * Rename wip to worker_idPawel Chojnacki2017-11-231-3/+3
| * Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-232-6/+5
* | Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-1/+1
|/
* Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-222-4/+0
* Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-222-4/+0
|\
| * Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-222-4/+0
* | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-212-3/+3
* | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-0/+1
* | Fix offense to the LineBreakAfterGuardClauses cop40335-master-is-broken-due-to-static-analysisRémy Coutable2017-11-201-0/+2
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-204-0/+5
|\ \ | |/ |/|
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-164-0/+5
* | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-172-1/+62
|\ \
| * | Don't add methods to Rack::AttackMichael Kozono2017-11-171-10/+12
| * | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-171-11/+1
| * | Allow throttling code in test environmentMichael Kozono2017-11-171-18/+14
| * | Add request throttlesMichael Kozono2017-11-172-1/+74
* | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-171-0/+26
|/ /
* | Update license_finder to 3.1.1Winnie Hellmann2017-11-161-0/+32
* | Resolve "npm list errors for gitlab-svgs and node-pre-gyp"Tim Zallmann2017-11-151-2/+2
|/
* Change label to be more consistent, not a series.Joshua Lambert2017-11-121-4/+2
* Fix CPU metricJoshua Lambert2017-11-121-2/+2
* Fix to use variableJoshua Lambert2017-11-121-1/+1
* Adjust metrics to ignore Job tag to support k8s 1.7+Joshua Lambert2017-11-121-2/+2
* Revert "Merge branch 'add-typescript' into 'master'"Jacob Schatz2017-11-101-5/+1
* Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-101-1/+9
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-081-0/+2
|\
| * Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+2
* | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-081-1/+1
|\ \
| * | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-061-1/+1
* | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-081-21/+31
|\ \ \
| * | | Free up some group reserved wordsBob Van Landuyt2017-11-071-27/+30
| * | | Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-071-15/+16
| * | | Free up `labels` as a group nameBob Van Landuyt2017-11-071-4/+10
| | |/ | |/|
* | | Merge branch 'jivl-fix-karma-config-file' into 'master'Mike Greiling2017-11-081-9/+0
|\ \ \
| * | | fix karma config filejivl-fix-karma-config-fileJose Ivan Vargas2017-11-071-9/+0
| |/ /
* | | Adds typescript support in webpack. With Mike G.Jacob Schatz2017-11-071-1/+5
|/ /
* | Fix wildcard route and use param styleShinya Maeda2017-11-071-1/+1
* | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-072-2/+3
|\ \
| * \ Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-071-0/+1
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-ite...Kamil Trzcinski2017-11-063-11/+19
| | |\ \
| | * \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...Shinya Maeda2017-11-051-0/+1
| | |\ \ \
| | * \ \ \ Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-se...Shinya Maeda2017-11-041-0/+1
| | |\ \ \ \
| | | * | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-011-1/+1
| | | * | | | Fix paths to the first pageKamil Trzcinski2017-11-011-0/+1
| * | | | | | Merge branch 'remove-per-cpu-metrics' into 'master'Tim Zallmann2017-11-071-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |