Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 2 | -2/+3 |
|\ | |||||
| * | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix xss for Markdown elements where [[_TOC_]] is enabled | Mark Chao | 2018-06-16 | 1 | -1/+1 |
| * | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+2 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into 'security-fj-bumping-sanitize-gem' | Douwe Maan | 2018-06-18 | 7 | -156/+39 |
| | |\ \ | |||||
| | * | | | Whitelist text-align property for th and td | Douwe Maan | 2018-06-18 | 1 | -1/+2 |
* | | | | | Honor saml assurance level to allow 2FA bypassing | Roger Rüttimann | 2018-06-25 | 4 | -0/+27 |
* | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 1 | -10/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Moves another RPC to mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -10/+1 |
* | | | | | | Merge branch 'zj-is-anchestor' into 'master' | Douwe Maan | 2018-06-25 | 2 | -91/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update remote happens through Gitaly only | Zeger-Jan van de Weg | 2018-06-25 | 1 | -75/+2 |
| * | | | | | | Anchestor check is Gitaly only now | Zeger-Jan van de Weg | 2018-06-25 | 1 | -16/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'zj-write-config' into 'master' | Douwe Maan | 2018-06-25 | 1 | -9/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Write Config is mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -9/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'zj-missing-part-linguist' into 'master' | Douwe Maan | 2018-06-25 | 1 | -23/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove feature gatezj-missing-part-linguist | Zeger-Jan van de Weg | 2018-06-25 | 1 | -23/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 1 | -87/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -87/+26 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master' | Grzegorz Bizon | 2018-06-25 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enforce setting string as value of the CI/CD variable | Tomasz Maczukin | 2018-06-25 | 1 | -0/+3 |
* | | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master' | Yorick Peterse | 2018-06-25 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetime | Jan Provaznik | 2018-06-21 | 1 | -0/+18 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'zj-commit-raw-diffs' into 'master' | Douwe Maan | 2018-06-22 | 1 | -7/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Raw diffs are served from Gitalyzj-commit-raw-diffs | Zeger-Jan van de Weg | 2018-06-22 | 1 | -7/+3 |
* | | | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master' | Robert Speicher | 2018-06-22 | 1 | -12/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parity | Robert Speicher | 2018-06-20 | 1 | -12/+13 |
* | | | | | | | | Merge branch 'zj-find-ref-name' into 'master' | Douwe Maan | 2018-06-22 | 1 | -11/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | FindRefName RPC now mandatoryzj-find-ref-name | Zeger-Jan van de Weg | 2018-06-22 | 1 | -11/+1 |
* | | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master' | Yorick Peterse | 2018-06-22 | 1 | -12/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gc | Ben Kochie | 2018-06-22 | 1 | -12/+14 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-repository-size' into 'master' | Douwe Maan | 2018-06-22 | 1 | -15/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Repository size is Gitaly onlyzj-repository-size | Zeger-Jan van de Weg | 2018-06-22 | 1 | -15/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'docs-request-cache' into 'master' | Sean McGivern | 2018-06-22 | 1 | -36/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add docs for RequestCache, moved from comments | Lin Jen-Shin | 2018-06-22 | 1 | -36/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Git ls files is Gitaly only now | Zeger-Jan van de Weg | 2018-06-22 | 1 | -34/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ... | Douwe Maan | 2018-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | [Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controller | blackst0ne | 2018-06-21 | 1 | -1/+1 |
* | | | | | | | Merge branch 'restore-custom-hooks-wiki' into 'master' | Douwe Maan | 2018-06-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Restore custom hooks for wikirestore-custom-hooks-wiki | Ahmad Hassan | 2018-06-21 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Changes tab VUE refactoring | Felipe Artur | 2018-06-21 | 3 | -12/+60 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'da-usage-ping' into 'master' | Sean McGivern | 2018-06-21 | 1 | -8/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add enabled prefix to feature keys to be consistent with other keysda-usage-ping | Douglas Barbosa Alexandre | 2018-06-20 | 1 | -8/+8 |
* | | | | | | | Raw changes calculation is Gitaly only now | Zeger-Jan van de Weg | 2018-06-21 | 1 | -19/+4 |
* | | | | | | | Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master' | Stan Hu | 2018-06-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Avoid N+1 queries while processing uploads | Michael Kozono | 2018-06-20 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'bvl-dont-generate-mo' into 'master' | Rubén Dávila | 2018-06-20 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't generate `.mo` files | Bob Van Landuyt | 2018-06-20 | 1 | -1/+0 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'unify-lib-tasks' into 'master' | Robert Speicher | 2018-06-20 | 2 | -2/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Unify flay.rake and gettext.rake from EEunify-lib-tasks | Lin Jen-Shin | 2018-06-21 | 2 | -2/+2 |
* | | | | | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'mas... | Robert Speicher | 2018-06-20 | 1 | -2/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | |