summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken karma test11-5-stable-patch-4Martin Wortschack2018-12-182-3/+9
* Resolve conflict in lib/api/files.rbSteve Azzopardi2018-12-171-5/+1
* Merge branch '54826-use-read_repository-scope-on-read-only-files-endpoints' i...Grzegorz Bizon2018-12-174-0/+70
* Merge branch '54626-able-to-download-a-single-archive-file-with-api-by-ref-na...Grzegorz Bizon2018-12-176-6/+215
* Fix conflict in spec/javascripts/notes/components/noteable_discussion_spec.jsWinnie Hellmann2018-12-171-46/+0
* Fix conflict in app/assets/javascripts/notes/components/noteable_discussion.vueWinnie Hellmann2018-12-171-41/+0
* Merge branch 'winh-collapse-discussions' into 'master'Fatih Acet2018-12-174-8/+70
* Merge branch '54975-fix-web-hooks-rake-task' into 'master'Stan Hu2018-12-174-17/+131
* Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas2018-12-178-15/+70
* Merge branch 'fix-multiple-comments-shade-overlap' into 'master'Fatih Acet2018-12-172-2/+7
* Update VERSION to 11.5.4v11.5.4GitLab Release Tools Bot2018-12-131-1/+1
* Update CHANGELOG.md for 11.5.4GitLab Release Tools Bot2018-12-132-5/+7
* Merge branch 'security-2754-fix-lfs-import-11-5' into 'security-11-5'John Jarvis2018-12-133-0/+20
* Update VERSION to 11.5.3v11.5.3GitLab Release Tools Bot2018-12-061-1/+1
* Update CHANGELOG.md for 11.5.3GitLab Release Tools Bot2018-12-062-5/+7
* Merge branch 'security-54857-fix-templates-path-traversal-11-5' into 'securit...Cindy Pallares2018-12-058-2/+90
* 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
|\ \