summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-253-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | HTML escape the name of the user in ProjectsHelper#link_to_memberImre Farkas2018-06-153-2/+15
| * | | | | | | | | | | | | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-253-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-163-1/+15
| * | | | | | | | | | | | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-256-11/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-18174-762/+978
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Update Gemfile.rails5.lockDouwe Maan2018-06-181-4/+8
| | * | | | | | | | | | | | | | | | Add changelog itemDouwe Maan2018-06-181-0/+5
| | * | | | | | | | | | | | | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-182-2/+13
| | * | | | | | | | | | | | | | | | Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5Francisco Javier López2018-06-152-5/+9
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.7.6Alessio Caiazza2018-06-211-0/+16
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.8.5Alessio Caiazza2018-06-211-0/+11
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.0.1Alessio Caiazza2018-06-211-0/+11
* | | | | | | | | | | | | | | | | | Merge branch '45933-webide-fade-uneditable-area' into 'master'Phil Hughes2018-06-252-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE"Paul Slaughter2018-06-252-2/+16
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-252-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add changelog entry6591-dont-load-omniauth-if-not-enabledLin Jen-Shin2018-06-251-0/+5
| * | | | | | | | | | | | | | | | | | Don't try to load omniauth if not enabledLin Jen-Shin2018-06-251-1/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'fl-fix-tech-debt' into 'master'Mike Greiling2018-06-256-129/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use Pascal Case for Vue components importsfl-fix-tech-debtFilipa Lacerda2018-06-251-8/+8
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into fl-fix-tech-debtFilipa Lacerda2018-06-25361-2864/+10582
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Moves tabs.js component into a vue fileFilipa Lacerda2018-06-214-94/+96
| * | | | | | | | | | | | | | | | | | | Moves remove_issue component into a .vue fileFilipa Lacerda2018-06-212-19/+19
* | | | | | | | | | | | | | | | | | | | Merge branch 'feature/honor-saml-assurance-level' into 'master'Douwe Maan2018-06-2514-93/+435
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-2514-93/+435
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-254-41/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-254-41/+22
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'unify-admin-controllers' into 'master'Douwe Maan2018-06-252-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-252-4/+4
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-253-369/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-252-353/+29
| * | | | | | | | | | | | | | | | | | | | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-252-40/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-252-40/+24
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'unify-delete_user_worker_spec.rb' into 'master'Douwe Maan2018-06-251-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Prefer `expect_next_instance_of` over `expect_any_instance_of`unify-delete_user_worker_spec.rbLin Jen-Shin2018-06-251-4/+6
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | 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-252-98/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-252-98/+27
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '6598-notify-only-open-unmergeable-mr' into 'master'Sean McGivern2018-06-255-27/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Notify conflict only for opened/locked merge requestsMark Chao2018-06-255-27/+52
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master'Phil Hughes2018-06-2513-37/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurableKushal Pandya2018-06-257-7/+22
| * | | | | | | | | | | | | | | | | | | | Update map name for default autocomplete configKushal Pandya2018-06-251-2/+2
| * | | | | | | | | | | | | | | | | | | | Add default autocomplete configKushal Pandya2018-06-255-28/+39
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs/document-new-preview' into 'master'Rémy Coutable2018-06-252-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Document how the new automatic review apps for docs workAchilleas Pipinellis2018-06-252-21/+20
* | | | | | | | | | | | | | | | | | | | | Merge branch '6165_project_security_dashboard-CE' into 'master'Filipa Lacerda2018-06-254-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Update project sidebar to work with EE feature Security DashboardOlivier Gonzalez2018-06-254-7/+15
|/ / / / / / / / / / / / / / / / / / / / /