summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-252-2/+3
|\
| * Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-251-1/+1
| |\
| | * Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-161-1/+1
| * | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-1/+2
| |\ \
| | * \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-187-156/+39
| | |\ \
| | * | | Whitelist text-align property for th and tdDouwe Maan2018-06-181-1/+2
* | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-254-0/+27
* | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-251-10/+1
|\ \ \ \ \
| * | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-251-10/+1
* | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-252-91/+3
|\ \ \ \ \ \
| * | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-251-75/+2
| * | | | | | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
| |/ / / / /
* | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-251-9/+3
|\ \ \ \ \ \
| * | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-251-9/+3
| |/ / / / /
* | | | | | Merge branch 'zj-missing-part-linguist' into 'master'Douwe Maan2018-06-251-23/+2
|\ \ \ \ \ \
| * | | | | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| |/ / / / /
* | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-251-87/+26
|\ \ \ \ \ \
| * | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-251-87/+26
| |/ / / / /
* | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-251-0/+3
|\ \ \ \ \ \
| * | | | | | Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-251-0/+3
* | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-251-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-211-0/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'zj-commit-raw-diffs' into 'master'Douwe Maan2018-06-221-7/+3
|\ \ \ \ \ \
| * | | | | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
* | | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'Robert Speicher2018-06-221-12/+13
|\ \ \ \ \ \ \
| * | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parityRobert Speicher2018-06-201-12/+13
* | | | | | | | Merge branch 'zj-find-ref-name' into 'master'Douwe Maan2018-06-221-11/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | FindRefName RPC now mandatoryzj-find-ref-nameZeger-Jan van de Weg2018-06-221-11/+1
* | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-221-12/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-221-12/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-repository-size' into 'master'Douwe Maan2018-06-221-15/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Repository size is Gitaly onlyzj-repository-sizeZeger-Jan van de Weg2018-06-221-15/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'docs-request-cache' into 'master'Sean McGivern2018-06-221-36/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add docs for RequestCache, moved from commentsLin Jen-Shin2018-06-221-36/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Git ls files is Gitaly only nowZeger-Jan van de Weg2018-06-221-34/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ...Douwe Maan2018-06-221-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controllerblackst0ne2018-06-211-1/+1
* | | | | | | Merge branch 'restore-custom-hooks-wiki' into 'master'Douwe Maan2018-06-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Restore custom hooks for wikirestore-custom-hooks-wikiAhmad Hassan2018-06-211-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Changes tab VUE refactoringFelipe Artur2018-06-213-12/+60
|/ / / / / /
* | | | | | Merge branch 'da-usage-ping' into 'master'Sean McGivern2018-06-211-8/+8
|\ \ \ \ \ \
| * | | | | | Add enabled prefix to feature keys to be consistent with other keysda-usage-pingDouglas Barbosa Alexandre2018-06-201-8/+8
* | | | | | | Raw changes calculation is Gitaly only nowZeger-Jan van de Weg2018-06-211-19/+4
* | | | | | | Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'Stan Hu2018-06-201-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Avoid N+1 queries while processing uploadsMichael Kozono2018-06-201-1/+1
| |/ / / / /
* | | | | | Merge branch 'bvl-dont-generate-mo' into 'master'Rubén Dávila2018-06-201-1/+0
|\ \ \ \ \ \
| * | | | | | Don't generate `.mo` filesBob Van Landuyt2018-06-201-1/+0
| |/ / / / /
* | | | | | Merge branch 'unify-lib-tasks' into 'master'Robert Speicher2018-06-202-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Unify flay.rake and gettext.rake from EEunify-lib-tasksLin Jen-Shin2018-06-212-2/+2
* | | | | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'mas...Robert Speicher2018-06-201-2/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |