ignore: testing rebase of old PR

CHANGELOG.rst

@@ -3,6 +3,14 @@
 0.60.0
 ------
 
+This release removes the Gitlab omnibus Helm chart that we created and used to have as a dependency
+of the Renku Helm chart. We have been discouraging anyone from using
+this chart in production and we specified this in our documentation as well.
+
+If you are using the internal Gitlab Helm chart then ensure to migrate to a separate
+Gitlab deployment as specified in our `documentation <https://renku.readthedocs.io/en/stable/how-to-guides/admin/gitlab.html#migrate-from-renku-bundled-omnibus-gitlab-to-cloud-native-gitlab-helm-chart>`_.
+before installing this or any subsequent Renku version. Gitlab publishes an official Helm chart and
+that is what should be used for deploying Gitlab with Helm.
 
 
 0.59.0
@@ -117,6 +125,10 @@ User-facing Changes
 Internal Changes
 ~~~~~~~~~~~~~~~~
 
+**Features**
+
+- **Helm chart**: remove the custom-made Gitlab Omnibus Helm chart from Renku dependencies
+
 **Bug Fixes**
 
 - **Gateway**: Fix path rewrite middleware when the path contains escaped characters (`#726 <https://github.com/SwissDataScienceCenter/renku-gateway/pull/726>`__).

docs/how-to-guides/admin/gitlab.rst

@@ -81,19 +81,8 @@ and existing GitLab users can use Renku without creating a separate Renku accoun
 GitLab deployed as part of Renku
 --------------------------------
 
-We do *not* recommend deploying the Renku-bundled GitLab as part of a production Renku deployment, 
-and instead suggest deploying GitLab using the `official GitLab cloud-native Kubernetes chart 
-<https://docs.gitlab.com/charts/>`_. Deploying GitLab as part of Renku may be deprecated in the future.
-
-If your Renku deployment includes GitLab you need to follow some additional steps to configure an admin user on GitLab.
-
-To grant a GitLab user the GitLab admin role without having access to the GitLab Web UI, the following steps can be taken in the GitLab container console.
-
-#. Run ``gitlab-rails console -e production`` (this might take a while).
-#. Find the user you would like to grant the admin role, for example by running ``user = User.find_by(email: '[email protected]')`` or ``user = User.find_by(username: 'renku')``.
-#. Grant the user the administrator role by running ``user.admin = true``.
-#. Save the user's profile by running ``user.save!``.
-#. Leave the console by running ``exit``.
+Deploying the GitLab Helm chart as part of the Renku Helm chart has been deprecated. If you have a Renku deployment that uses
+the Gitlab version that used to come bundled with Renku, then please follow the instructions below to migrate.
 
 Migrate from Renku-bundled Omnibus GitLab to cloud-native Gitlab Helm chart
 ---------------------------------------------------------------------------