summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed user avatar link render empty spacemr-image-commentingPhil Hughes2018-11-071-2/+1
* Restored width & height propertiesPhil Hughes2018-11-067-9/+74
* Re-implemented image commenting on diffsPhil Hughes2018-11-0537-205/+832
* Merge branch 'fast_project_blob_path' into 'master'Douwe Maan2018-11-0510-46/+98
|\
| * Improve performance of tree rendering in repositories with lots of itemsDrew Blessing2018-10-3110-46/+98
* | Merge branch 'docs/gitlab-pages-permissions' into 'master'Nick Thomas2018-11-051-2/+3
|\ \
| * | Add access controlled pages entry to permissions tabledocs/gitlab-pages-permissionsEvan Read2018-11-051-2/+3
* | | Merge branch 'ml-create-user-via-api-qa' into 'master'Grzegorz Bizon2018-11-056-42/+89
|\ \ \
| * | | Create users via the APIml-create-user-via-api-qaMark Lapierre2018-11-026-42/+89
* | | | Merge branch '53450-wrong-value-for-kubernetes_version-variable' into 'master'Kamil Trzciński2018-11-052-1/+6
|\ \ \ \
| * | | | Bump KUBERNETES_VERSION to latest 1.10 series53450-wrong-value-for-kubernetes_version-variableThong Kuah2018-11-042-1/+6
* | | | | Merge branch 'frozen-string-enable-lib-gitlab-ci-remain' into 'master'Grzegorz Bizon2018-11-0547-8/+105
|\ \ \ \ \
| * | | | | Enable frozen string for lib/gitlab/ci/**/*.rbgfyoung2018-10-3047-8/+105
* | | | | | Merge branch '51259-ci-cd-gitlab-ui' into 'master'Phil Hughes2018-11-0512-50/+74
|\ \ \ \ \ \
| * | | | | | Uses gitlab-ui components in jobs components.51259-ci-cd-gitlab-uiFilipa Lacerda2018-11-0212-50/+74
* | | | | | | Merge branch 'toggle-sidebar-alignment' into 'master'Phil Hughes2018-11-053-2/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Align toggle sidebar button across all browsers and OSstoggle-sidebar-alignmentAnnabel Dunstone Gray2018-11-023-2/+8
* | | | | | | Update CHANGELOG.md for 11.4.5GitLab Release Tools Bot2018-11-043-10/+14
* | | | | | | Merge branch 'update-def-of-done-with-qa-tests-requirement' into 'master'Evan Read2018-11-041-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Using inline links per review feedbackupdate-def-of-done-with-qa-tests-requirementSanad Liaquat2018-11-021-4/+2
| * | | | | | | Changed dev stage team to quality teamSanad Liaquat2018-11-011-2/+2
| * | | | | | | Update definition of done with e2e tests requirementSanad Liaquat2018-10-291-0/+3
* | | | | | | | Merge branch 'update_license_management_job' into 'master'Kamil Trzciński2018-11-042-9/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Update license_management jobPhilippe Lafoucrière2018-11-042-9/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-32' into 'master'Evan Read2018-11-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update mysql.mdAndreas Volkmann2018-11-021-1/+1
| * | | | | | | | Update mysql.md with correct anchor link to "how services are linked"Andreas Volkmann2018-11-011-1/+1
* | | | | | | | | Merge branch '53467-transient-failure-in-spec-controllers-groups-boards_contr...Stan Hu2018-11-042-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix transient error with boards_controller_spec53467-transient-failure-in-spec-controllers-groups-boards_controller_spec-rbBrett Walker2018-11-032-5/+7
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-optimize-mr-commit-sha-lookup' into 'master'Douwe Maan2018-11-036-5/+73
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Optimize merge request refresh by using the database to check commit SHAssh-optimize-mr-commit-sha-lookupStan Hu2018-11-026-5/+73
* | | | | | | | | Merge branch 'use-our-own-docker-image-for-helm-install-pods' into 'master'Kamil Trzciński2018-11-025-14/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use our own docker image for helm install podsuse-our-own-docker-image-for-helm-install-podsDylan Griffith2018-11-025-14/+3
* | | | | | | | | Merge branch 'ccr/51520_change_milestone_email' into 'master'11-5-stable-prepare-rc1Robert Speicher2018-11-0221-5/+399
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add email for milestone changeChantal Rollison2018-11-0221-5/+399
|/ / / / / / / /
* | | | | | | | Merge branch '51716-create-kube-namespace' into 'master'Kamil Trzciński2018-11-0233-341/+873
|\ \ \ \ \ \ \ \
| * | | | | | | | Incorporates Kubernetes Namespace into Cluster's flowThong Kuah2018-11-0233-341/+873
|/ / / / / / / /
* | | | | | | | Merge branch 'ml-fix-logging-qa' into 'master'Sean McGivern2018-11-022-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Don't log fabricate argsMark Lapierre2018-11-022-4/+4
* | | | | | | | Merge branch 'rd-set-missing-fields-on-migration' into 'master'Douwe Maan2018-11-021-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes a migration that causes error on some legacy DBsrd-set-missing-fields-on-migrationRubén Dávila2018-11-011-2/+2
* | | | | | | | | Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'Douwe Maan2018-11-027-4/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-boardBrett Walker2018-10-314-4/+4
| * | | | | | | | | Dynamically store the valid label endpointBrett Walker2018-10-317-4/+56
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-0243-318/+634
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use polymorphic_paths where we cantop_level_clusters_controllerThong Kuah2018-11-022-28/+4
| * | | | | | | | | Remove method as using nested resource routesThong Kuah2018-11-027-17/+0
| * | | | | | | | | Add missing specs for PresenterThong Kuah2018-11-022-0/+53
| * | | | | | | | | Resolve controller sharing concernThong Kuah2018-11-0138-107/+133
| * | | | | | | | | Restore 403 functionality for external auth (EE)Thong Kuah2018-11-014-9/+23