summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '11-5-stable-patch-2' into '11-5-stable'"revert-3f019419Cindy Pallares 🦉2018-12-0499-103437/+9167
* Update VERSION to 11.5.2v11.5.2GitLab Release Tools Bot2018-12-031-1/+1
* Update CHANGELOG.md for 11.5.2GitLab Release Tools Bot2018-12-038-35/+16
* Merge branch '11-5-stable-patch-2' into '11-5-stable'Steve Azzopardi2018-12-03106-9167/+103472
|\
| * Update db/schema.rbSteve Azzopardi2018-12-031-1/+1
| * Update db/schema.db with latest migrationSteve Azzopardi2018-12-031-1/+1
| * Remove specification of rails version in migrationSteve Azzopardi2018-12-031-1/+1
| * Remove `ee` directory for `ce` repoSteve Azzopardi2018-12-031-5/+0
| * Merge branch '53778-post-deployment-fix' into 'master'Yorick Peterse2018-11-301-0/+0
| * Merge branch '53778-remove-site-statistics' into 'master'Sean McGivern2018-11-3010-224/+27
| * Fixed GitLab UI importPhil Hughes2018-11-302-2/+5
| * Merge branch 'dm-batch-loader-sidekiq' into 'master'Stan Hu2018-11-303-0/+19
| * Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into 'ma...Phil Hughes2018-11-303-6/+56
| * Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-11-3037-8839/+102987
| * Merge branch '54282-tooltip-stuck' into 'master'Phil Hughes2018-11-302-4/+9
| * Merge branch 'move-assets-compile-sooner' into 'master'Marin Jankovski2018-11-301-1/+2
| * Merge branch 'sh-fix-hash-filename-handling' into 'master'Douglas Barbosa Alexandre2018-11-303-2/+35
| * Merge branch 'docs/andr3-update-issue-board-screenshot' into 'master'Kushal Pandya2018-11-304-0/+0
| * Merge branch '53763-fix-encrypt-columns-data-loss' into 'master'Stan Hu2018-11-305-2/+96
| * Merge branch '54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-c...Rémy Coutable2018-11-301-0/+1
| * Merge branch 'issue_53908' into 'master'Marcia Ramos2018-11-302-0/+20
| * Merge branch 'image-diff-size-fix' into 'master'Filipa Lacerda2018-11-304-35/+12
| * Merge branch 'docs/pages-access-control' into 'master'Evan Read2018-11-305-11/+58
| * Merge branch 'fix-not-render-emoji' into 'master'Mike Greiling2018-11-303-5/+13
| * Merge branch 'docs/post-merge-pipelines' into 'master'Marcia Ramos2018-11-302-0/+28
| * Merge branch 'docs/direct-link-review-apps' into 'master'Marcia Ramos2018-11-303-8/+26
| * Merge branch 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-3014-26/+54
| * Merge branch 'qa-staging-15-use-existing-users-ce' into 'master'Mark Lapierre2018-11-303-1/+28
|/
* Update VERSION to 11.5.1v11.5.1GitLab Release Tools Bot2018-11-261-1/+1
* Update CHANGELOG.md for 11.5.1GitLab Release Tools Bot2018-11-2618-87/+23
* Merge branch 'security-11-5-fj-crlf-injection' into 'security-11-5'Steve Azzopardi2018-11-265-54/+128
|\
| * [11.5] Fix CRLF issue in UrlValidatorFrancisco Javier López2018-11-265-54/+128
|/
* Merge branch 'security-fix-uri-xss-applications-11-5' into 'security-11-5'Steve Azzopardi2018-11-267-2/+121
|\
| * Resolve reflected XSS in Ouath authorize windowJames Lopez2018-11-267-2/+121
* | Merge branch 'security-11-5-fix-webhook-ssrf-ipv6' into 'security-11-5'Steve Azzopardi2018-11-263-13/+112
|\ \
| * | Fix SSRF in project integrationsFrancisco Javier López2018-11-123-13/+112
* | | Merge branch 'security-email-change-notification-11-5' into 'security-11-5'Steve Azzopardi2018-11-265-0/+32
|\ \ \
| * | | Provide email notification on email updatesJames Lopez2018-11-125-0/+32
| |/ /
* | | Merge branch 'security-guest-comments-11-5' into 'security-11-5'Steve Azzopardi2018-11-2613-34/+187
|\ \ \ | |_|/ |/| |
| * | [11.5] Fixed ability to comment on and edit/delete comments on locked or conf...Chantal Rollison2018-11-2613-34/+187
|/ /
* | Merge branch 'security-11-5-pages-toctou-race' into 'security-11-5'Steve Azzopardi2018-11-262-1/+7
|\ \
| * | Upgrade GitLab Pages to v1.3.1Alessio Caiazza2018-11-212-1/+7
* | | Merge branch 'security-fix-pat-web-access-11-5' into 'security-11-5'Steve Azzopardi2018-11-2628-281/+538
|\ \ \
| * | | Update code to use API scope on PAT authJames Lopez2018-11-2328-281/+538
|/ / /
* | | Merge branch 'security-11-5-xss-in-markdown-following-unrecognized-html-eleme...Steve Azzopardi2018-11-235-2/+25
|\ \ \
| * | | Sanitize output of SpacedLinkFilterBrett Walker2018-11-165-2/+25
* | | | Merge branch 'security-mermaid-xss-11-5' into 'security-11-5'Steve Azzopardi2018-11-234-1/+21
|\ \ \ \
| * | | | Configure mermaid to not render HTML content in diagramsWinnie Hellmann2018-11-192-0/+8
| * | | | Add failing test for XSS in mermaid diagramsWinnie Hellmann2018-11-192-1/+13
| | |/ / | |/| |
* | | | Merge branch 'security-bvl-exposure-in-commits-list-11-5' into 'security-11-5'Steve Azzopardi2018-11-233-55/+67
|\ \ \ \