summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' int...Filipa Lacerda2018-01-171-0/+5
| | * Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2018-01-173-0/+17
| | |\
| | | * Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-173-0/+17
| | * | Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2018-01-173-3/+8
| | |\ \ | | | |/
| | * | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-175-10/+19
| * | | fixed up merge request badge mergePhil Hughes2018-01-174-7/+11
| | |/ | |/|
| * | Merge branch '42046-fork-icon' into 'master'Fatih Acet2018-01-173-3/+8
| |/
| * Merge branch 'builds-api-nplusone' into 'master'Stan Hu2018-01-174-4/+52
| * Merge branch 'docs/sast-dast' into 'master'Marcia Ramos2018-01-174-9/+137
| * Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-173-2/+16
| * Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-173-0/+25
| * Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-177-16/+67
| * Merge branch 'sh-remove-import-retry-count-warning' into 'master'Robert Speicher2018-01-171-2/+2
| * Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-174-1/+81
| * Merge branch '41799-managed-prometheus-deployment-install-a-lot-of-extra-stuf...Kamil Trzciński2018-01-175-38/+105
| * Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2018-01-171-13/+17
| |\
| | * Merge branch '41809-auto-devops-performance-docker-image-not-compatible-with-...Kamil Trzciński2018-01-171-13/+17
| * | Correct applications.vue conflict?Luke Bennett2018-01-171-27/+23
| |/
| * Merge branch '41797-prometheus-wording-fixes' into 'master'Kamil Trzciński2018-01-171-24/+27
| * Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-1718-14/+749
|/
* Update VERSION to 10.4.0-rc6v10.4.0-rc6Mark Fletcher2018-01-171-1/+1
* Merge branch '10-4-stable-with-rc5-and-rc6' into '10-4-stable'Mark Fletcher2018-01-1746-79/+281
|\
| * 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