summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix deployment jobs using nil token53879-kube-token-nilThong Kuah2018-11-136-3/+26
| | | | | | | | Unfortunately, it seems that the migration to clusters_kubernetes_namespace still needs to create the new restricted service accounts and then fetch the tokens. Until that is done, we cannot use it and have to fall back to the main token from clusters_platform_kubernetes.
* Add failing test case for bug reportThong Kuah2018-11-131-1/+39
| | | | And also check KUBE_TOKEN in other scenarios
* Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-114-3/+20
|\ | | | | | | | | Fix error handling bugs in kubernetes integration See merge request gitlab-org/gitlab-ce!22922
| * 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
| | | | | | | | | | | | | | I have also extracted an issue in https://gitlab.com/gitlab-org/gitlab-ce/issues/53738 to surface these errors to users but now I am just fixing the bug where kubernetes_namespace is undefined while handling this error
| * Remove special handling for 404 response from K8sDylan Griffith2018-11-091-2/+0
| | | | | | | | | | | | There is no reason to specially handle 404 here. We only handle 404 specifically if we are fetching something and want to return `nil` if 404. This does not apply here.
* | Merge branch '51259-ci-cd-gitlab-ui-1' into 'master'Clement Ho2018-11-098-68/+96
|\ \ | | | | | | | | | | | | Use gitlab-ui in jobs and pipelines See merge request gitlab-org/gitlab-ce!22782
| * | 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 migration See merge request gitlab-org/gitlab-ce!22951
| * | Remove circular dependency on Redactable in migrationStan Hu2018-11-092-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::BackgroundMigration::RedactLinks was prepending EE::Gitlab::BackgroundMigration::RedactLinks, while EE::Gitlab::BackgroundMigration::RedactLinks was trying to include Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed with an uninitialized constant (https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).
* | | Merge branch '48475-gitlab-pages-settings-regressions' into 'master'Annabel Dunstone Gray2018-11-094-13/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GitLab Pages settings regressions" Closes #48475 See merge request gitlab-org/gitlab-ce!22821
| * | | 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-ui See merge request gitlab-org/gitlab-ce!22923
| * | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-092-14/+6
| | | | | | | | | | | | | | | | | | Updates clipboard button component to use the new glTooltipDirective and the new glButton component from gitlab-ui
* | | Merge branch '53768-diff-comment-action-btns' into 'master'Phil Hughes2018-11-092-4/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of diff comment buttons Closes #53768 See merge request gitlab-org/gitlab-ce!22944
| * | | 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 spec See merge request gitlab-org/gitlab-ce!22948
| * | | | Fix DashboardHelper reference in specStan Hu2018-11-091-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Helpers::DashboardHelper doesn't actually exist, and Ruby 2.5 gets rid of the automatic top-level constant lookup (https://bugs.ruby-lang.org/issues/11547).
* | | | Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-092-3/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve possible cherry pick API race condition Closes #53773 See merge request gitlab-org/gitlab-ce!22946
| * | | | Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-092-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we just fetched the latest commit for the given branch when presenting the resulting commit, but because something could have been committed to that branch between the time we cherry-picked and the time we render the result, the wrong commit could have been presented. Now, we fetch the commit object with the commit SHA returned by the commit change service, which should always be the correct commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
* | | | | Merge branch 'frozen-string-lib-gitlab-more' into 'master'Rémy Coutable2018-11-09102-5/+214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable even more frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22863
| * | | | | Enable even more frozen string in lib/gitlabgfyoung2018-11-06102-5/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozens string for the following: * lib/gitlab/conflict/**/*.rb * lib/gitlab/cross_project_access/**/*.rb * lib/gitlab/cycle_analytics/**/*.rb * lib/gitlab/data_builder/**/*.rb * lib/gitlab/database/**/*.rb * lib/gitlab/dependency_linker/**/*.rb * lib/gitlab/diff/**/*.rb * lib/gitlab/downtime_check/**/*.rb * lib/gitlab/email/**/*.rb * lib/gitlab/etag_caching/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | | | | Merge branch 'docs-zj-hooks-update' into 'master'34758-group-cluster-controllerMarcia Ramos2018-11-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symlinked hooks aren't executed See merge request gitlab-org/gitlab-ce!22933
| * | | | | | Symlinked hooks aren't executeddocs-zj-hooks-updateZeger-Jan van de Weg2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This recently changed on the Gitaly side, but now spotted this in the docs for the next release. Updated to be more precise, and to signal users should not want control over this specific hook location.
* | | | | | | 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 time Closes #53621 See merge request gitlab-org/gitlab-ce!22938
| * | | | | | | Ensure we create the secrets at the right time53621-review-app-credentials-does-not-reliably-workRémy Coutable2018-11-092-1/+3
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `deploy`, if the previous deployment failed, we delete/cleanup all the objects related to the release, including secrets. The problem is that if we create the root password before that, it will be then recreated during the deploy with a random value! By creatigng the secret just before actually deplying a new release, we ensure that it won't be overriden. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-095-2/+199
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
| * | | | | | Add revert to commits APIRobert Speicher2018-11-094-0/+193
| | | | | | |
| * | | | | | Correct error message returned by ChangeServiceRobert Speicher2018-11-081-2/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the string was spanning multiple lines and included a needless `\n` character in the resulting error message. This change also reduces duplication by assigning two variables.
* | | | | | Merge branch '51792-improve-debugging-capabilities-for-helm-installs' into ↵Kamil Trzciński2018-11-099-41/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve Debugging Capabilities For Helm Application Installs See merge request gitlab-org/gitlab-ce!22924
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | User can create a group level cluster and install applications See merge request gitlab-org/gitlab-ce!22450
| * | | | | | Still raise if there's no #actual_namespaceThong Kuah2018-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, we only need to raise for project_type clusters to maintain previous behaviour. In all probablity this requirement to have actual_namespace came from KubernetesService and will no longer be required soon.
| * | | | | | Reverse view override as EE has an override tooThong Kuah2018-11-087-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use presenters instead otherwise we will have x2 overides in EE
| * | | | | | Refactor to use presenterThong Kuah2018-11-088-24/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refacotr project or group specific `if` logic to be contained within each presenter instead. Also add :override to ensure super method exists.
| * | | | | | Raise on unknown clusterableThong Kuah2018-11-081-0/+2
| | | | | | |
| * | | | | | Consolidate how we allow user defined namespaceThong Kuah2018-11-087-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use model method as single source of truth instead of splitting between presenter and Kubernetes model
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group clusters should not allow Project Namespace so don't show that field input too
| * | | | | | Minor updates to spec for readabilityThong Kuah2018-11-082-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on BE reviewer feedback
| * | | | | | Adds feature flag for Group ClustersMayra Cabrera2018-11-083-29/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the frontend is still in progress and other related backend is still in prgress we need a feature flag to turn off Group Clusters.
| * | | | | | 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
| | | | | | |