summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Show clusters of ancestors in cluster list page34758-list-group-clustersThong Kuah2018-11-123-2/+41
* Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-114-3/+20
|\
| * Add changelog for fixing k8s integration error handlingfix-error-handling-bugs-in-kubernetes-integrationThong Kuah2018-11-091-0/+5
| * Fix error handling in cluster_platform_configure_workerDylan Griffith2018-11-092-1/+15
| * Remove special handling for 404 response from K8sDylan Griffith2018-11-091-2/+0
* | Merge branch '51259-ci-cd-gitlab-ui-1' into 'master'Clement Ho2018-11-098-68/+96
|\ \
| * | Use gitlab-ui in jobs and pipelinesFilipa Lacerda2018-11-098-68/+96
|/ /
* | Merge branch 'sh-redact-links-remove-circular-dependency-ce' into 'master'Douglas Barbosa Alexandre2018-11-092-17/+27
|\ \
| * | Remove circular dependency on Redactable in migrationStan Hu2018-11-092-17/+27
* | | Merge branch '48475-gitlab-pages-settings-regressions' into 'master'Annabel Dunstone Gray2018-11-094-13/+17
|\ \ \
| * | | Resolve "GitLab Pages settings regressions"Scott Hampton2018-11-094-13/+17
|/ / /
* | | Merge branch '51259-gitlab-ui-replacement' into 'master'Clement Ho2018-11-092-14/+6
|\ \ \ | |/ / |/| |
| * | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-092-14/+6
* | | Merge branch '53768-diff-comment-action-btns' into 'master'Phil Hughes2018-11-092-4/+3
|\ \ \
| * | | Fix alignment of diff comment buttons53768-diff-comment-action-btnsAnnabel Dunstone Gray2018-11-092-4/+3
* | | | Merge branch 'sh-fix-dashboard-helper-constant' into 'master'Douglas Barbosa Alexandre2018-11-091-1/+1
|\ \ \ \
| * | | | Fix DashboardHelper reference in specStan Hu2018-11-091-1/+1
|/ / / /
* | | | Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-092-3/+10
|\ \ \ \
| * | | | Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-092-3/+10
* | | | | Merge branch 'frozen-string-lib-gitlab-more' into 'master'Rémy Coutable2018-11-09102-5/+214
|\ \ \ \ \
| * | | | | Enable even more frozen string in lib/gitlabgfyoung2018-11-06102-5/+214
* | | | | | Merge branch 'docs-zj-hooks-update' into 'master'34758-group-cluster-controllerMarcia Ramos2018-11-091-1/+1
|\ \ \ \ \ \
| * | | | | | Symlinked hooks aren't executeddocs-zj-hooks-updateZeger-Jan van de Weg2018-11-091-1/+1
* | | | | | | Merge branch '53621-review-app-credentials-does-not-reliably-work' into 'master'Douglas Barbosa Alexandre2018-11-092-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Ensure we create the secrets at the right time53621-review-app-credentials-does-not-reliably-workRémy Coutable2018-11-092-1/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-095-2/+199
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add revert to commits APIRobert Speicher2018-11-094-0/+193
| * | | | | | Correct error message returned by ChangeServiceRobert Speicher2018-11-081-2/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '51792-improve-debugging-capabilities-for-helm-installs' into 'm...Kamil Trzciński2018-11-099-41/+40
|\ \ \ \ \ \
| * | | | | | Improve Debugging Capabilities For Helm Application InstallsDylan Griffith2018-11-099-41/+40
|/ / / / / /
* | | | | | Merge branch '34758-group-cluster-controller' into 'master'Kamil Trzciński2018-11-0953-240/+1277
|\ \ \ \ \ \
| * | | | | | Still raise if there's no #actual_namespaceThong Kuah2018-11-081-0/+1
| * | | | | | Reverse view override as EE has an override tooThong Kuah2018-11-087-21/+21
| * | | | | | Refactor to use presenterThong Kuah2018-11-088-24/+48
| * | | | | | Raise on unknown clusterableThong Kuah2018-11-081-0/+2
| * | | | | | Consolidate how we allow user defined namespaceThong Kuah2018-11-087-9/+31
| * | | | | | Remove methods already provided by presentersThong Kuah2018-11-081-8/+0
| * | | | | | Resolve rubocop warningsMike Greiling2018-11-082-2/+1
| * | | | | | Remove "active" badge from cluster index for nowMike Greiling2018-11-081-3/+1
| * | | | | | Rename is_project? to project?Mike Greiling2018-11-085-5/+5
| * | | | | | Update copy above new cluster formMike Greiling2018-11-082-8/+15
| * | | | | | Remove trailing commas to satisfy rubocopMike Greiling2018-11-081-3/+3
| * | | | | | Remove tests related to removed toggle buttonMike Greiling2018-11-081-31/+0
| * | | | | | Update empty state for group clusters indexMike Greiling2018-11-085-5/+35
| * | | | | | Only project clusters has Project Namespace fieldThong Kuah2018-11-0811-30/+46
| * | | | | | Minor updates to spec for readabilityThong Kuah2018-11-082-23/+35
| * | | | | | Adds feature flag for Group ClustersMayra Cabrera2018-11-083-29/+52
| * | | | | | Add active and connection disabled badges to clustersMike Greiling2018-11-081-0/+4
| * | | | | | Fix vertical padding between clusters in index pageMike Greiling2018-11-081-0/+4
| * | | | | | Redesign cluster indexMike Greiling2018-11-083-14/+40