summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.9.10v11.9.10GitLab Release Tools Bot2019-04-261-1/+1
* Update CHANGELOG.md for 11.9.10GitLab Release Tools Bot2019-04-266-25/+11
* Merge branch 'security-approval-race-condition-11-9' into '11-9-stable'GitLab Release Tools Bot2019-04-252-3/+33
|\
| * Add ApplicationRecord#safe_ensure_unique methodPatrick Bajao2019-04-122-3/+33
* | Merge branch 'security-upgrade-to-rails-5-0-7-2-11-9' into '11-9-stable'GitLab Release Tools Bot2019-04-253-36/+41
|\ \
| * | Upgrade Rails to 5.0.7.2Heinrich Lee Yu2019-04-123-36/+41
| |/
* | Merge branch 'security-pb-email-watchers-no-access-11-9' into '11-9-stable'GitLab Release Tools Bot2019-04-253-12/+53
|\ \
| * | Stop sending emails to users who can't read commitPatrick Bajao2019-04-163-12/+53
| |/
* | Merge branch 'security-id-email-xss-11-9' into '11-9-stable'GitLab Release Tools Bot2019-04-252-1/+6
|\ \
| * | Escape path in new merge request mailIgor Drozdov2019-04-172-1/+6
| |/
* | Merge branch 'security-issue_2830-11-9' into '11-9-stable'GitLab Release Tools Bot2019-04-253-7/+27
|\ \
| * | Prevent leaking information when issue is movedFelipe Artur2019-04-223-7/+27
| |/
* | Merge branch 'security-update-gitaly-to-11-27-2' into '11-9-stable'GitLab Release Tools Bot2019-04-252-1/+6
|\ \
| * | Add changelogOswaldo Ferreira2019-04-231-0/+5
| * | Update Gitaly to 11.27.2Oswaldo Ferreira2019-04-231-1/+1
|/ /
* | Update VERSION to 11.9.9v11.9.9GitLab Release Tools Bot2019-04-231-1/+1
* | Update CHANGELOG.md for 11.9.9GitLab Release Tools Bot2019-04-232-5/+7
* | Merge branch '11-9-stable-patch-9' into '11-9-stable'Marin Jankovski2019-04-235-2/+64
|\ \
| * | Merge branch 'sh-backport-list-commits-by-oid-rugged' into 'master'11-9-stable-patch-9Douwe Maan2019-04-235-2/+64
|/ /
* | Merge branch 'asset-tag-fix-11-9' into '11-9-stable'Marin Jankovski2019-04-232-9/+12
|\ \ | |/ |/|
| * Merge branch 'tag-pipeline-asset-image' into 'master'asset-tag-fix-11-9Rémy Coutable2019-04-122-1/+7
| * Merge branch 'rename-asset-image' into 'master'Marin Jankovski2019-04-121-8/+5
|/
* Update VERSION to 11.9.8v11.9.8GitLab Release Tools Bot2019-04-111-1/+1
* Update CHANGELOG.md for 11.9.8GitLab Release Tools Bot2019-04-115-20/+16
* Merge branch '11-9-stable-patch-8' into '11-9-stable'John Skarbek2019-04-1152-62/+1560
|\
| * 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
* | Revert "Merge branch 'restore-hipchat-11-9' into '11-9-stable'"John Jarvis2019-04-1126-963/+27
* | Merge branch 'restore-hipchat-11-9' into '11-9-stable'John Jarvis2019-04-1126-27/+963
|\ \ | |/ |/|
| * Restore index on services.typeSean McGivern2019-04-112-0/+21
| * Add frozen_string_literal to HipChat filesSean McGivern2019-04-113-0/+5
| * Add changelog entrySean McGivern2019-04-111-0/+5
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-1127-48/+953
|/
* 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