summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix badly solved conflicts10-4-stable-prepare-rc7Filipa Lacerda2018-01-171-1/+1
* Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2018-01-171-0/+8
|\
| * Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-171-0/+8
* | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-172-5/+8
|/
* Merge branch 'builds-api-nplusone' into 'master'Stan Hu2018-01-172-4/+50
* Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-171-1/+10
* Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+19
* Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-171-0/+41
* Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-172-0/+75
* Merge branch '41799-managed-prometheus-deployment-install-a-lot-of-extra-stuf...Kamil Trzciński2018-01-172-4/+25
* Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-174-11/+391
* Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'10-4-stable-with-rc5-and-rc6LUKE BENNETT2018-01-1712-32/+160
|\
| * Merge branch '42025-fix-issue-api' into 'master'10-4-stable-prepare-rc6Sean McGivern2018-01-151-0/+9
| * Merge branch '41937-vue-prop-type' into 'master'Phil Hughes2018-01-151-8/+26
| * Merge branch 'fj-41598-fixing-request-mime-type' into 'master'Douwe Maan2018-01-151-0/+10
| * Merge branch '41970-job-play-button' into 'master'Kamil Trzciński2018-01-151-3/+11
| * Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-151-2/+24
| * Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-151-13/+35
| * Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into 'ma...Tim Zallmann2018-01-153-3/+3
| * Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-152-2/+28
| * Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-151-1/+14
* | 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-154-8/+92
* | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-153-0/+107
* | Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-151-13/+44
* | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-152-0/+22
* | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1512-52/+51
* | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-156-14/+105
* | Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-151-0/+62
* | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-153-1/+70
* | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-152-36/+20
* | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-151-0/+9
* | Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-151-4/+51
* | Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-153-8/+38
|/
* Merge branch 'gcp-fix' into 'master'10-4-stable-prepare-rc4Kamil Trzciński2018-01-115-21/+92
* Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-clusters-...Yorick Peterse2018-01-111-0/+312
* Revert "Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-c...Luke Bennett2018-01-111-312/+0
* Merge branch '10-4-stable-missing-commits' into 10-4-stable-prepare-rc3-with-...Luke Bennett2018-01-1015-186/+739
|\
| * Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-clusters-...Yorick Peterse2018-01-081-0/+312
| |\
| | * Fix static analysysShinya Maeda2018-01-081-9/+9
| | * Disable STI of ActiveRecord. Refactoring specs.Shinya Maeda2018-01-081-64/+164
| | * Revert bulk_insert and bring back AR insert(one by one)Shinya Maeda2018-01-081-12/+28
| | * Add a new test for emptified paramsShinya Maeda2018-01-081-2/+19
| | * Fix static anylysyShinya Maeda2018-01-081-7/+7
| | * Opitmize migration process by using both unmanaged_kubernetes_service and kub...Shinya Maeda2018-01-081-6/+0
| | * Add logic to swtich environment_scope by the situationShinya Maeda2018-01-081-10/+40
| | * Add env_scope testsShinya Maeda2018-01-081-0/+32
| | * Fix testShinya Maeda2018-01-081-187/+52
| | * Restructure specShinya Maeda2018-01-081-160/+229
| | * Add test. Disable KubernetesService when migratedShinya Maeda2018-01-081-0/+189