summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.0.0-rc3v11.0.0-rc3Mayra Cabrera2018-06-051-1/+1
* Merge branch '11-0-stable-prepare-rc3' into '11-0-stable'Mayra Cabrera2018-06-0553-256/+433
|\
| * Merge branch '46878-bs4-pagination-is-pipeline-s-page-has-no-styling' into 'm...Clement Ho2018-06-0511-102/+25
| * Merge branch '46751-collapsed-mr-sidebar-avatar-is-not-aligned-correctly' int...Clement Ho2018-06-051-0/+9
| * Merge branch 'fix-form-headers' into 'master'Filipa Lacerda2018-06-051-0/+5
| * Merge branch '47146-new-project-active-tab' into 'master'Clement Ho2018-06-052-7/+9
| * Merge branch 'fix-admin-user-form' into 'master'Filipa Lacerda2018-06-052-11/+11
| * Merge branch '47236-print-fix' into 'master'11-0-stable-prepare-rc3Phil Hughes2018-06-051-2/+3
| * Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-054-29/+121
| * Merge branch '45820-add-xcode-link' into 'master'Phil Hughes2018-06-055-0/+61
| * Merge branch 'bootstrap-markdown-code-highlight' into 'master'Annabel Gray2018-06-051-0/+1
| * Merge branch 'jivl-fix-gitea-import' into 'master'Annabel Gray2018-06-051-2/+2
| * Merge branch 'jivl-fix-labels-page' into 'master'Annabel Gray2018-06-052-1/+9
| * Merge branch '47236-github-import-btn' into 'master'Clement Ho2018-06-051-1/+1
| * Merge branch '47158-bs4-nav-projects-dropdown-overflow' into 'master'Annabel Gray2018-06-052-6/+6
| * Merge branch '47273-bs4-header-sub-nav-dropdown-active-states' into 'master'Clement Ho2018-06-051-2/+2
| * Merge branch '6287-epics-page-styling-is-broken' into 'master'Clement Ho2018-06-052-3/+8
| * Merge branch 'fix-responsive-mr-form' into 'master'Annabel Gray2018-06-051-4/+4
| * Merge branch '47266-visiblity-import-sources-checkbox-styling' into 'master'Sean McGivern2018-06-052-4/+6
| * Merge branch '47147-project-visibility-alignment' into 'master'Clement Ho2018-06-052-2/+2
| * Merge branch 'ide-alignment-fixes' into 'master'Filipa Lacerda2018-06-052-6/+27
| * Merge branch 'fix-jobs-log' into 'master'Filipa Lacerda2018-06-051-0/+14
| * Merge branch '47115-fix-markdown-blockquote' into 'master'Clement Ho2018-06-052-11/+13
| * Merge branch 'jivl-fix-labels-not-displayed-after-selection' into 'master'Clement Ho2018-06-052-1/+5
| * Merge branch '46885-group-visibility' into 'master'Clement Ho2018-06-051-1/+1
| * Merge branch '47162-styling-of-acceptance-terms-page-is-broken' into 'master'Clement Ho2018-06-053-8/+10
| * Merge branch 'osw-ignore-diff-header-when-persisting-diff-hunk' into 'master'Sean McGivern2018-06-054-53/+78
|/
* Update VERSION to 11.0.0-rc2v11.0.0-rc2Robert Speicher2018-06-041-1/+1
* Merge branch '11-0-stable-prepare-rc2' into '11-0-stable'Mayra Cabrera2018-06-04186-846/+1640
|\
| * Merge branch 'revert-add-per-project-pipeline-from-rc2' into '11-0-stable-pre...Robert Speicher2018-06-0423-165/+28
| |\
| | * Revert "Merge branch 'per-project-pipeline-iid' into 'master'"Mayra Cabrera2018-06-0423-165/+28
| |/
| * Merge branch 'master' into 11-0-stable-prepare-rc211-0-stable-prepare-rc2Alessio Caiazza2018-06-04207-874/+1805
| |\ |/ /
| * Merge branch 'workhorse-4-3-0' into 'master'Douwe Maan2018-06-041-1/+1
| |\
| | * Update to GitLab Workhorse v4.3.0Nick Thomas2018-06-011-1/+1
| * | Merge branch 'fj-34526-enabling-wiki-search-by-title' into 'master'Douwe Maan2018-06-0414-107/+159
| |\ \
| | * | Add ability to search wiki titlesFrancisco Javier López2018-06-0414-107/+159
| |/ /
| * | Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-brokenSean McGivern2018-06-042-1/+6
| |\ \
| | * | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-032-1/+6
| * | | Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master'Douwe Maan2018-06-042-1/+6
| |\ \ \
| | * | | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3Bob Van Landuyt2018-06-042-1/+6
| * | | | Merge branch 'ide-highlighter-type-fox' into 'master'Filipa Lacerda2018-06-041-1/+1
| |\ \ \ \
| | * | | | Fixed typo in commit message help popoveride-highlighter-type-foxPhil Hughes2018-06-011-1/+1
| * | | | | Merge branch 'sh-fix-issue-43981' into 'master'Douwe Maan2018-06-042-22/+21
| |\ \ \ \ \
| | * | | | | Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981Stan Hu2018-06-022-22/+21
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-045-12/+24
| |\ \ \ \ \
| | * | | | | Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_cl...sh-fix-secrets-not-workingStan Hu2018-06-021-1/+1
| | * | | | | Fix attr_encryption key settingsStan Hu2018-06-024-11/+23
| | |/ / / /
| * | | | | Merge branch 'sh-add-missing-squash-param-api-docs' into 'master'Achilleas Pipinellis2018-06-041-0/+1
| |\ \ \ \ \
| | * | | | | Fix missing squash parameter in doc/api/merge_requests.mdsh-add-missing-squash-param-api-docsStan Hu2018-05-301-0/+1
| * | | | | | Merge branch 'per-project-pipeline-iid' into 'master'Grzegorz Bizon2018-06-0423-28/+165
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |