Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue

@@ -14,7 +14,9 @@ const CUSTOM_APP_WARNING_TEXT = {
   [PROMETHEUS]: s__('ClusterIntegration|All data will be deleted and cannot be restored.'),
   [RUNNER]: s__('ClusterIntegration|Any running pipelines will be canceled.'),
   [KNATIVE]: s__('ClusterIntegration|The associated IP will be deleted and cannot be restored.'),
-  [JUPYTER]: '',
+  [JUPYTER]: s__(
+    'ClusterIntegration|All data not committed to GitLab will be deleted and cannot be restored.',
+  ),
 };
 
 export default {

app/models/clusters/applications/jupyter.rb

@@ -40,12 +40,6 @@ module Clusters
         content_values.to_yaml
       end
 
-      # Will be addressed in future MRs
-      # We need to investigate and document what will be permanently deleted.
-      def allowed_to_uninstall?
-        false
-      end
-
       def install_command
         Gitlab::Kubernetes::Helm::InstallCommand.new(
           name: name,

changelogs/unreleased/feature-uninstall_jupyter_hub_app.yml

+---
+title: Allow JupyterHub to be uninstalled from the UI
+merge_request: 30097
+author:
+type: added

doc/user/clusters/applications.md

@@ -251,6 +251,7 @@ The applications below can be uninstalled.
 
 | Application | GitLab version | Notes |
 | ----------- | -------------- | ----- |
+| JupyterHub  | 12.1+         | All data not committed to GitLab will be deleted and cannot be restored. |
 | Prometheus  | 11.11+         | All data will be deleted and cannot be restored. |
 
 To uninstall an application:
@@ -287,4 +288,3 @@ To avoid installation errors:
   kubectl get secrets/tiller-secret -n gitlab-managed-apps -o "jsonpath={.data['ca\.crt']}" | base64 -d > b.pem
   diff a.pem b.pem
   ```
-

doc/user/project/deploy_tokens/index.md

@@ -15,7 +15,7 @@ You can create as many deploy tokens as you like from the settings of your proje
 1. Go to the project you want to create Deploy Tokens for.
 1. Go to **Settings** > **Repository**.
 1. Click on "Expand" on **Deploy Tokens** section.
-1. Choose a name and optionally an expiry date for the token.
+1. Choose a name, expiry date (optional), and username (optional) for the token.
 1. Choose the [desired scopes](#limiting-scopes-of-a-deploy-token).
 1. Click on **Create deploy token**.
 1. Save the deploy token somewhere safe. Once you leave or refresh
@@ -39,6 +39,13 @@ the following table.
 | `read_repository` | Allows read-access to the repository through `git clone` |
 | `read_registry` | Allows read-access to [container registry] images if a project is private and authorization is required. |
 
+## Deploy token custom username
+
+> [Introduced][https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29639] in GitLab 12.1.
+
+The default username format is `gitlab+deploy-token-#{n}`. Some tools or platforms may not support this format,
+in such case you can specify custom username to be used when creating the deploy token.
+
 ## Usage
 
 ### Git clone a repository

locale/gitlab.pot

@@ -2886,6 +2886,9 @@ msgstr ""
 msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration"
 msgstr ""
 
+msgid "ClusterIntegration|All data not committed to GitLab will be deleted and cannot be restored."
+msgstr ""
+
 msgid "ClusterIntegration|All data will be deleted and cannot be restored."
 msgstr ""
 

spec/models/clusters/applications/jupyter_spec.rb

@@ -16,7 +16,7 @@ describe Clusters::Applications::Jupyter do
 
     subject { jupyter.can_uninstall? }
 
-    it { is_expected.to be_falsey }
+    it { is_expected.to be_truthy }
   end
 
   describe '#set_initial_status' do