summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'10-4-stable-with-rc5-and-rc6LUKE BENNETT2018-01-1746-79/+281
|\
| * Merge branch '42025-fix-issue-api' into 'master'10-4-stable-prepare-rc6Sean McGivern2018-01-153-2/+18
| * Merge branch '41937-vue-prop-type' into 'master'Phil Hughes2018-01-152-9/+31
| * Merge branch 'fj-41598-fixing-request-mime-type' into 'master'Douwe Maan2018-01-153-3/+16
| * Merge branch '41970-job-play-button' into 'master'Kamil Trzciński2018-01-153-9/+17
| * Merge branch 'projects-dropdown-perf' into 'master'Filipa Lacerda2018-01-151-5/+2
| * Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse2018-01-153-2/+8
| * Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-153-8/+31
| * Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-153-17/+51
| * Merge branch 'remove-beta-notice-for-clusters' into 'master'Achilleas Pipinellis2018-01-151-3/+0
| * Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-151-0/+3
| * Merge branch 'fix/sidebar-collapse-button-spacing' into 'master'Phil Hughes2018-01-151-1/+0
| * Merge branch 'dz-improve-code-quality-docs' into 'master'Achilleas Pipinellis2018-01-151-1/+2
| * Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into 'ma...Tim Zallmann2018-01-158-8/+11
| * Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-155-2/+38
| * Merge branch '41607-require-rsync-docs' into 'master'Achilleas Pipinellis2018-01-153-5/+20
| * Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-155-4/+33
* | Update VERSION to 10.4.0-rc5v10.4.0-rc5Luke Bennett2018-01-151-1/+1
* | Merge branch '10-4-security-patch-rebased' into '10-4-stable'LUKE BENNETT2018-01-1593-277/+1217
|\ \ | |/ |/|
| * Make ruby lint happyOswaldo Ferreira2018-01-151-2/+2
| * Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-158-13/+118
| * Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-157-4/+176
| * Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-155-16/+68
| * Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-155-1/+28
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1533-141/+383
| * Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-158-20/+133
| * Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-154-2/+83
| * Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-154-2/+71
| * Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-157-54/+43
| * Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-152-1/+10
| * Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-152-5/+52
| * Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-159-18/+52
|/
* Update VERSION to 10.4.0-rc4v10.4.0-rc4Robert Speicher2018-01-121-1/+1
* Merge branch '10-4-stable-prepare-rc4' into '10-4-stable'Marin Jankovski2018-01-1215-47/+603
|\
| * Merge branch 'gcp-fix' into 'master'10-4-stable-prepare-rc4Kamil Trzciński2018-01-1112-47/+135
| * Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-clusters-...Yorick Peterse2018-01-113-0/+468
|/
* Update VERSION to 10.4.0-rc3v10.4.0-rc3Luke Bennett2018-01-111-1/+1
* Merge branch '10-4-stable-prepare-rc3' into '10-4-stable'Marin Jankovski2018-01-11228-2716/+12396
|\
| * Merge branch '10-4-stable-prepare-rc3-with-missing-commits' into '10-4-stable...Marin Jankovski2018-01-1150-748/+892
| |\
| | * Merge branch '10-4-stable-prepare-rc3-with-missing-commits' of https://gitlab...10-4-stable-prepare-rc3-with-missing-commitsLuke Bennett2018-01-111-170/+0
| | |\
| | | * Delete fast_ssh_key_lookup.mdLuke Bennett2018-01-111-170/+0
| | * | Revert "Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-c...Luke Bennett2018-01-113-468/+0
| | |/
| | * Merge branch '10-4-stable-missing-commits' into 10-4-stable-prepare-rc3-with-...Luke Bennett2018-01-1053-748/+1360
| | |\
| | | * Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-clusters-...Yorick Peterse2018-01-083-0/+468
| | | |\
| | | | * Add memoization for properties40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetesShinya Maeda2018-01-081-4/+10
| | | | * Fix static analysysShinya Maeda2018-01-081-9/+9
| | | | * Disable STI of ActiveRecord. Refactoring specs.Shinya Maeda2018-01-082-66/+184
| | | | * Fix StaticSnalysysShinya Maeda2018-01-081-1/+1
| | | | * Fix change logShinya Maeda2018-01-081-1/+1
| | | | * Add changelogShinya Maeda2018-01-081-0/+5