summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-11-6-55320-stored-xss-in-user-status' into 'security-1...Tim Zallmann2019-02-041-4/+4
* Merge branch 'security-11-6-22076-sanitize-url-in-names' into 'security-11-6'Yorick Peterse2019-01-2537-51/+59
* Merge branch 'security-project-move-users-11-6' into 'security-11-6'Yorick Peterse2019-01-253-1/+23
* Merge branch 'sh-fix-issue-56663-11-6' into 'security-11-6'Yorick Peterse2019-01-242-3/+3
* Merge branch 'security-import-path-logging-11-6' into 'security-11-6'Yorick Peterse2019-01-242-2/+24
* Merge branch 'security-contributed-projects-11-6' into 'security-11-6'Yorick Peterse2019-01-241-0/+7
* Merge branch 'security-11-6-2769-idn-homograph-attack' into '11-6-stable'Yorick Peterse2019-01-241-1/+1
|\
| * Show tooltip for malicious looking linksBrett Walker2019-01-211-1/+1
* | Merge branch 'security-pipeline-trigger-tokens-exposure-11-6' into 'security-...Yorick Peterse2019-01-245-6/+27
* | Merge branch 'security-fix-regex-dos-11-6' into 'security-11-6'Yorick Peterse2019-01-241-0/+1
* | Merge branch 'security-do-not-process-mr-ref-for-guests-11-6' into 'security-...Yorick Peterse2019-01-241-1/+1
* | Merge branch 'security-bump-rails-version-11-6' into 'security-11-6'Yorick Peterse2019-01-243-4/+27
* | Merge branch 'security-fix-wiki-access-rights-with-external-wiki-enabled-11-6...Yorick Peterse2019-01-247-23/+31
* | Merge branch 'security-11-6-test-permissions' into 'security-11-6'Yorick Peterse2019-01-2418-39/+93
* | Merge branch 'security-fix-new-issues-login-message-11-6' into 'security-11-6'Yorick Peterse2019-01-241-9/+1
* | Merge branch 'security-guests-can-see-list-of-merge-requests-11-6' into 'secu...Yorick Peterse2019-01-243-11/+38
* | Merge branch 'security-fix-lfs-import-project-ssrf-forgery-11-6' into 'securi...Yorick Peterse2019-01-244-45/+107
* | Merge branch 'security-2779-fix-email-comment-permissions-check-11-6' into 's...Yorick Peterse2019-01-244-14/+9
* | Merge branch 'security-extract-pages-with-rubyzip-dev-11-6' into 'security-11-6'Yorick Peterse2019-01-241-16/+25
* | Merge branch 'security-11-6-commit-status-shown-for-guest-user' into 'securit...Yorick Peterse2019-01-241-1/+1
* | Merge branch 'security-2776-fix-add-reaction-permissions-11-6' into 'security...Yorick Peterse2019-01-241-0/+1
* | Merge branch 'security-2767-verify-lfs-finalize-from-workhorse-11-6' into 'se...Yorick Peterse2019-01-241-1/+1
* | Merge branch 'sh-fix-issue-55161' into 'master'Rémy Coutable2019-01-221-5/+15
|/
* Merge branch 'sh-fix-request-profiles-html' into 'master'Sean McGivern2019-01-161-1/+1
* Merge branch 'sh-fix-real-size-warnings' into 'master'Robert Speicher2019-01-161-1/+1
* Merge branch '55945-suggested-change-highlight' into 'master'Phil Hughes2019-01-161-1/+1
* Merge branch 'suggestion-dashes' into 'master'Kushal Pandya2019-01-162-4/+2
* Merge branch '11-6-8810-fix-weight-sort' into '11-6-stable-patch-5'Alex Hanselka2019-01-162-9/+11
|\
| * Backport of 8810-fix-weight-sort11-6-8810-fix-weight-sortMario de la Ossa2018-12-182-9/+11
* | Merge branch 'sh-fix-clone-url-for-https' into 'master'11-6-stable-patch-3Douglas Barbosa Alexandre2019-01-041-2/+2
* | Merge branch 'use-px-not-rems' into 'master'Annabel Dunstone Gray2019-01-023-2/+9
* | Merge branch 'sh-fix-clone-geo-dropdown' into 'master'Stan Hu2019-01-021-12/+12
* | Merge branch 'pipeline-labels' into 'master'Stan Hu2019-01-021-2/+2
* | Merge branch 'sh-fix-http-clone-panel' into 'master'Kushal Pandya2019-01-023-22/+33
* | Merge branch 'markdown-toolbar-btn-fix' into 'master'Filipa Lacerda2019-01-021-2/+2
* | Merge branch '55282-dark-theme-colors' into 'master'Mike Greiling2019-01-021-1/+1
* | Merge branch '55103-hide-group-cluster-features' into 'master'Kushal Pandya2019-01-024-1/+37
* | Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'ma...Kamil Trzciński2019-01-021-1/+1
* | Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2019-01-023-10/+4
* | Merge branch '51668-fix-line-numbers' into 'master'Mike Greiling2019-01-021-1/+6
* | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-2711-15/+78
|\ \
| * \ Merge branch 'security-fix/security-group-user-removal-11-6' into 'security-1...John Jarvis2018-12-276-4/+56
| |\ \
| | * \ Merge branch 'security-11-6' into 'security-fix/security-group-user-removal-1...James Lopez2018-12-2718-48/+146
| | |\ \
| | * | | Add subresources removal to member destroy serviceJames Lopez2018-12-136-6/+52
| * | | | Merge remote-tracking branch 'origin/security-48259-private-snippet-11-6' int...John Jarvis2018-12-275-11/+22
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Block private snippets from being embeddableMark Chao2018-12-205-11/+22
| | |/ /
* | | | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-2719-56/+145
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch 'security-11-6-secret-ci-variables-exposed' into 'security-11-6'John Jarvis2018-12-275-14/+53
| |\ \
| | * | Backport security fix for 11.6Matija Čupić2018-12-085-14/+53
| | |/
| * | Merge branch 'security-11-6-user-keeps-access-to-mr-issue-when-removed-from-t...John Jarvis2018-12-271-1/+1
| |\ \