summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'restore-hipchat-11-9' into '11-9-stable'11-9-stable-patch-8John Jarvis2019-04-1126-27/+963
* Merge branch 'sh-disable-diff-instrumentation' into 'master'Michael Kozono2019-04-112-1/+5
* Merge branch 'fix-pull-request-importer' into 'master'Kamil Trzciński2019-04-113-1/+79
* Merge branch 'allow-to-use-untrusted-ruby-syntax' into 'master'Sean McGivern2019-04-119-25/+223
* Merge branch 'fj-59547-fix-has-commits' into 'master'Nick Thomas2019-04-112-4/+11
* Merge branch 'id-mr-list-when-filtered-by-approvers-only' into 'master'Douglas Barbosa Alexandre2019-04-115-4/+64
* Merge branch 'docs-google_secure_ldap' into 'master'Evan Read2019-04-115-0/+215
* Update VERSION to 11.9.7v11.9.7GitLab Release Tools Bot2019-04-091-1/+1
* Update CHANGELOG.md for 11.9.7GitLab Release Tools Bot2019-04-091-0/+4
* Update VERSION to 11.9.6v11.9.6GitLab Release Tools Bot2019-04-041-1/+1
* Update CHANGELOG.md for 11.9.6GitLab Release Tools Bot2019-04-045-20/+13
* Merge branch '11-9-stable-patch-6' into '11-9-stable'John Skarbek2019-04-046-17/+28
|\
| * Revert "Update CHANGELOG.md for 11.9.5"11-9-stable-patch-6John T Skarbek2019-04-035-10/+21
| * Merge branch 'leipert-hotfix-ci-yml' into 'master'Stan Hu2019-04-031-7/+7
|/
* Update VERSION to 11.9.5v11.9.5GitLab Release Tools Bot2019-04-031-1/+1
* Update CHANGELOG.md for 11.9.5GitLab Release Tools Bot2019-04-035-20/+13
* Removing security-milestone-labels.yml from ee/ dir on gitlab-ceJohn Jarvis2019-04-031-5/+0
* Merge branch '11-9-stable-patch-5' into '11-9-stable'John Jarvis2019-04-0326-87/+147
|\
| * Merge branch 'remove-expand-diff-feature-flag' into 'master'11-9-stable-patch-5Filipa Lacerda2019-04-024-13/+2
| * Merge branch 'weimeng-master-patch-83366' into 'master'Stan Hu2019-04-021-1/+4
| * Merge branch 'sh-fix-rugged-tree-entries' into 'master'Sean McGivern2019-04-023-9/+18
| * Merge branch 'sh-force-gc-after-import' into 'master'Douglas Barbosa Alexandre2019-04-025-3/+24
| * Merge branch 'sh-fix-project-branches-merge-status' into 'master'Douwe Maan2019-04-023-5/+30
| * Merge branch 'jira-transition-id-field' into 'master'Evan Read2019-04-021-1/+1
| * Merge branch 'recreate-all-diffs-on-import' into 'master'Yorick Peterse2019-04-023-43/+56
| * Merge branch 'remove-cng-job' into 'master'Robert Speicher2019-04-021-1/+1
| * Merge branch 'qa-allow-gitlab-qa-pat-env-var' into 'master'Rémy Coutable2019-04-025-11/+11
|/
* Update VERSION to 11.9.4v11.9.4GitLab Release Tools Bot2019-03-281-1/+1
* Update CHANGELOG.md for 11.9.4GitLab Release Tools Bot2019-03-289-40/+14
* Revert "Update CHANGELOG.md for 11.9.3"Robert Speicher2019-03-289-11/+41
* Merge branch 'security-exif-fix-orientation-11-9' into '11-9-stable'GitLab Release Tools Bot2019-03-282-1/+2
|\
| * Preserve Orientation when removing EXIFJan Provaznik2019-03-282-1/+2
|/
* Update VERSION to 11.9.3v11.9.3GitLab Release Tools Bot2019-03-271-1/+1
* Update CHANGELOG.md for 11.9.3GitLab Release Tools Bot2019-03-279-40/+14
* Add empty 11.9.2 changelog entryRobert Speicher2019-03-271-0/+4
* Revert "Update CHANGELOG.md for 11.9.2"Robert Speicher2019-03-279-14/+40
* Update VERSION to 11.9.2v11.9.2GitLab Release Tools Bot2019-03-261-1/+1
* Update CHANGELOG.md for 11.9.2GitLab Release Tools Bot2019-03-269-40/+14
* Merge branch 'security-55503-fix-pdf-js-11-9' into '11-9-stable'Yorick Peterse2019-03-268-32169/+50870
|\
| * Updated PDF.js to 2.0.943Natalia Tepluhina2019-03-208-32169/+50870
* | Merge branch 'security-mass-assignment-on-project-update-11-9' into '11-9-sta...Yorick Peterse2019-03-263-5/+30
|\ \
| * | Refactor specs according to the code reviewMałgorzata Ksionek2019-03-261-1/+1
| * | Add cr remarksMałgorzata Ksionek2019-03-253-5/+5
| * | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-213-5/+30
* | | Merge branch 'security-exif-migration-11-9' into '11-9-stable'Yorick Peterse2019-03-267-1/+364
|\ \ \
| * | | Rake task for removing exif from uploadsJan Provaznik2019-03-267-1/+364
|/ / /
* | | Merge branch 'security-id-potential-denial-languages-11-9' into '11-9-stable'GitLab Release Tools Bot2019-03-2613-18/+130
|\ \ \
| * | | Return cached languages if they've been detected beforeIgor Drozdov2019-03-2013-18/+130
* | | | Merge branch 'security-2819-xss-resolve-conflicts-branch-name-11-9' into '11-...GitLab Release Tools Bot2019-03-263-1/+21
|\ \ \ \
| * | | | Fix XSS in resolve conflicts formPaul Slaughter2019-03-213-1/+21
| | |/ / | |/| |