summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'rs-alphanumeric-ssh-params-9-3' into 'security-9-3'James Edwards-Jones2017-08-083-0/+47
|\ \ \ | |/ / |/| |
| * | Ensure user and hostnames begin with an alnum character in UrlBlockerRobert Speicher2017-08-063-0/+47
* | | Merge branch '9-3-stable' into 'security-9-3'Brian Neel2017-08-063-2/+13
|\ \ \ | | |/ | |/|
| * | Merge branch 'fix-docs-re2-install' into 'master'Rémy Coutable2017-08-011-1/+1
| * | Update VERSION to 9.3.9v9.3.9James Edwards-Jones2017-07-201-1/+1
| * | Update CHANGELOG.md for 9.3.9James Edwards-Jones2017-07-202-4/+4
| * | Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-203-8/+45
| * | Update VERSION to 9.3.8v9.3.8James Edwards-Jones2017-07-191-1/+1
| * | Update CHANGELOG.md for 9.3.8James Edwards-Jones2017-07-195-16/+7
| * | Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3'Douwe Maan2017-07-194-1/+103
| * | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-1911-21/+300
| * | Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-193-0/+44
| * | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-199-4/+174
| * | Merge branch 'issue-title-leakage' into 'security-9-3'Robert Speicher2017-07-1922-119/+88
* | | Merge branch 'race-condition-in-project-uploads-fix-9-3' into 'security-9-3'Sean McGivern2017-07-243-1/+10
|\ \ \
| * | | Fixes race condition in project uploadsTiago Botelho2017-07-243-1/+10
* | | | Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-203-8/+45
|\ \ \ \
| * | | | Add changelogNick Thomas2017-07-201-0/+4
| * | | | Fix an infinite loop in Gitlab::UntrustedRegexpNick Thomas2017-07-202-8/+41
| |/ / /
* | | | Revert "Fix scanning of regular expressions using re2"Stan Hu2017-07-202-11/+19
* | | | Fix scanning of regular expressions using re2Stan Hu2017-07-202-19/+11
|/ / /
* | | Merge branch '9-3-stable' into security-9-3James Edwards-Jones2017-07-19175-486/+1898
|\ \ \ | |/ / | | / | |/ |/|
| * Update VERSION to 9.3.7v9.3.7Clement Ho2017-07-181-1/+1
| * Update CHANGELOG.md for 9.3.7Clement Ho2017-07-183-8/+5
| * Merge branch '9-3-stable-patch-7' into '9-3-stable'Kushal Pandya2017-07-1710-14/+88
| |\
| | * Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'9-3-stable-patch-7Sean McGivern2017-07-125-6/+53
| | * Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-125-8/+35
| |/
| * Update VERSION to 9.3.6v9.3.6kushalpandya2017-07-121-1/+1
| * Update CHANGELOG.md for 9.3.6kushalpandya2017-07-125-17/+7
| * Merge branch '9-3-stable-patch-6' into '9-3-stable'Kushal Pandya2017-07-1128-46/+370
| |\
| | * Merge branch '34909-pipeline-dropdown-z-index' into 'master'9-3-stable-patch-6Filipa Lacerda2017-07-111-1/+1
| | * Merge branch '34153-extend-mr-tabs' into 'master'Phil Hughes2017-07-111-2/+8
| | * Merge branch 'grpc-1.4' into 'master'Sean McGivern2017-07-101-1/+1
| | * Fix conflictClement Ho2017-07-101-5/+2
| | * Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-1015-38/+294
| | * Merge branch 'dm-encode-tree-and-blob-paths' into 'master'Rémy Coutable2017-07-103-0/+13
| | * Merge branch 'sh-disable-flipper-midddlware-tests' into 'master'Rémy Coutable2017-07-101-2/+4
| | * Merge branch 'dm-mysql-log_bin_trust_function_creators' into 'master'Sean McGivern2017-07-102-1/+25
| | * Merge branch 'issue-description-gfm' into 'master'Filipa Lacerda2017-07-103-0/+17
| | * Merge branch 'username-password-stripped-from-import-url-fix' into 'master'Douwe Maan2017-07-102-0/+9
| |/
| * Fixed CHANGELOG.md for 9.3.4 releaseJames Edwards-Jones2017-07-061-1/+1
| * Update VERSION to 9.3.5v9.3.5James Edwards-Jones2017-07-051-1/+1
| * Update CHANGELOG.md for 9.3.5James Edwards-Jones2017-07-056-21/+8
| * Merge branch '9-3-stable-patch-5' into 9-3-stableJames Edwards-Jones2017-07-0534-68/+354
| |\
| | * Fix for spec failure in gitaly_client/ref_spec.rb on stable9-3-stable-patch-5James Edwards-Jones2017-07-051-1/+1
| | * Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' int...Grzegorz Bizon2017-07-041-2/+2
| | * Merge branch '34470-fix-award-slash-command-placeholder' into 'master'Phil Hughes2017-07-042-0/+49
| | * Revert "Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' i...James Edwards-Jones2017-07-041-6/+9
| | * Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-047-2/+43
| | * Merge branch '34525-backport-update-go-to-91-92-guide' into 'master'Sean McGivern2017-07-042-16/+34