summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync `groups` and `group` to fix validation34758-unique-environment-scopeThong Kuah2018-11-031-6/+11
* 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
| * | | | Move view and path concerns to presentersThong Kuah2018-11-0113-60/+157
| * | | | Abstract out project out of ClustersControllerThong Kuah2018-11-0118-75/+168
| * | | | Convert clusters to use a top-level controllerThong Kuah2018-11-0138-62/+136
* | | | | Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-0210-42/+98
|\ \ \ \ \
| * | | | | Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-3110-42/+98
* | | | | | Merge branch 'add-scheduled-flag-to-job-entity' into 'master'Kamil Trzciński2018-11-025-1/+17
|\ \ \ \ \ \
| * | | | | | Add scheduled flag to job entityShinya Maeda2018-11-025-1/+17
|/ / / / / /
* | | | | | Merge branch 'ce-jej/group-saml-discovery-token' into 'master'Kamil Trzciński2018-11-022-3/+10
|\ \ \ \ \ \
| * | | | | | TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-tokenJames Edwards-Jones2018-10-312-3/+10
* | | | | | | Merge branch 'remove-ci_enable_scheduled_build-feature-flag' into 'master'Kamil Trzciński2018-11-025-54/+14
|\ \ \ \ \ \ \
| * | | | | | | Remove ci_enable_scheduled_build feature flagShinya Maeda2018-11-025-54/+14
|/ / / / / / /
* | | | | | | Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-026-11/+33
|\ \ \ \ \ \ \
| * | | | | | | Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-serviceStan Hu2018-11-012-8/+8
| * | | | | | | Avoidp loading merge request diff files when not neededStan Hu2018-11-012-3/+6
| * | | | | | | Significantly cut memory usage and SQL queries when reloading diffsStan Hu2018-11-013-1/+20
* | | | | | | | Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' i...Sean McGivern2018-11-023-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in labels_helper_spec.rb52548-links-in-tabs-of-the-labels-index-pages-ends-with-htmlDmitriy Zaporozhets2018-11-011-1/+1
| * | | | | | | | Fix bug when links in tabs of the labels index pages ends with .htmlDmitriy Zaporozhets2018-10-313-1/+31
* | | | | | | | | Merge branch 'ab-45608-stuck-mr-query' into 'master'Sean McGivern2018-11-023-1/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add index to find stuck merge requests.ab-45608-stuck-mr-queryAndreas Brandl2018-11-013-1/+23
* | | | | | | | | | Merge branch 'gl-ui-progress-bar' into 'master'Phil Hughes2018-11-023-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove gitlab-ui's progress bar from globalClement Ho2018-11-023-2/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-11-02456-3331/+4717
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'kinolaev-master-patch-91872' into 'master'Dmitriy Zaporozhets2018-11-022-1/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Change HELM_HOST in Auto-DevOps to work behind proxySergej2018-11-012-1/+6
| * | | | | | | | | | | Merge branch 'sh-link-bitbucket-server-import-docs' into 'master'Evan Read2018-11-011-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Link Bitbucket Server from import index pagesh-link-bitbucket-server-import-docsStan Hu2018-11-011-1/+2
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher2018-11-011-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-workingStan Hu2018-10-251-1/+5
| * | | | | | | | | | | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-013-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-313-10/+15
| * | | | | | | | | | | | | Merge branch 'user-model-merge-conflicts' into 'master'Robert Speicher2018-11-012-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status