summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-project-system-hooks-in-transaction' into 'master'10-4-stable-patch-2-conflictsRobert Speicher2018-01-294-1/+77
* Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-291-1/+1
* Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-a...Douwe Maan2018-01-2911-8/+53
* Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-...Rémy Coutable2018-01-293-2/+30
* Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-292-20/+35
* Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-293-28/+111
* Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-292-0/+12
* Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-293-2/+7
* Update VERSION to 10.4.1v10.4.1Robert Speicher2018-01-241-1/+1
* Update CHANGELOG.md for 10.4.1Robert Speicher2018-01-247-32/+15
* Merge branch '10-4-stable-patch-1' into '10-4-stable'Luke Bennett2018-01-2480-191/+932
|\
| * Merge branch '42361-workaround' into 'master'10-4-stable-patch-1Robert Speicher2018-01-241-0/+3
| * Resolve conflict for secret management on Auto-DevOpsMayra Cabrera2018-01-231-3/+0
| * Merge branch 'vendor-10-4-auto-devops-template' into 'master'Marin Jankovski2018-01-231-0/+5
| * Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-233-8/+27
| * Merge branch '40612-cannot-change-project-visibility-from-private-even-when-o...Robert Speicher2018-01-234-6/+28
| * fix failures for loading_icon.vueJacob Schatz2018-01-221-2/+0
| * resolve repo_commit_section.vueJacob Schatz2018-01-221-39/+1
| * resolve conflicts in loading_icon.vueJacob Schatz2018-01-221-4/+1
| * resolves changes in app.vueJacob Schatz2018-01-221-57/+18
| * Merge branch 'fix-description-loss' into 'master'Phil Hughes2018-01-222-0/+90
| * Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes2018-01-2225-76/+211
| * Merge branch 'docs/dast-cleanup' into 'master'Marcia Ramos2018-01-221-8/+13
| * Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-223-1/+23
| * Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2212-15/+15
| * Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-226-14/+102
| * Merge branch 'sh-scheduled-ci-pipeline-docs' into 'master'Achilleas Pipinellis2018-01-223-0/+15
| * Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-223-11/+17
| * Merge branch 'docs/runners-clear-cache' into 'master'Marcia Ramos2018-01-221-0/+22
| * Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master'Marcia Ramos2018-01-221-0/+6
| * Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-225-2/+42
| * Merge branch 'docs/refactor-k8s-cluster' into 'master'Marcia Ramos2018-01-222-45/+241
| * Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'Stan Hu2018-01-223-0/+79
| * Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-224-3/+76
|/
* Update VERSION to 10.4.0v10.4.0Luke Bennett2018-01-221-1/+1
* Update CHANGELOG.md for 10.4.0Luke Bennett2018-01-22145-731/+164
* Update VERSION to 10.4.0-rc8v10.4.0-rc8Luke Bennett2018-01-191-1/+1
* Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'Marin Jankovski2018-01-1950-139/+361
|\
| * Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-193-3/+6
| * Fixes incorrect resolution for applications.vue file10-4-stable-prepare-rc8Mayra Cabrera2018-01-181-1/+1
| * Fix incorrect conflict resolution for cluster JSEric Eastwood2018-01-181-0/+2
| * Merge branch 'remove-ide-pref' into 'master'Tim Zallmann2018-01-182-29/+0
| * Merge branch 'jramsay-15567-lfs-icon-docs' into 'master'Marcia Ramos2018-01-182-0/+5
| * Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-182-1/+10
| * Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1839-105/+337
|/
* Update VERSION to 10.4.0-rc7v10.4.0-rc7Luke Bennett2018-01-181-1/+1
* Merge branch '10-4-stable-prepare-rc7' into '10-4-stable'Luke Bennett2018-01-1860-111/+1299
|\
| * Fix badly solved conflicts10-4-stable-prepare-rc7Filipa Lacerda2018-01-173-3/+4
| * fixed eslintPhil Hughes2018-01-171-1/+1
| * Merge branch '10-4-stable-prepare-rc7' of gitlab.com:gitlab-org/gitlab-ce int...Phil Hughes2018-01-178-3/+30
| |\