Automatic merge of gitlab-org/gitlab-ce master

app/views/admin/groups/show.html.haml

@@ -40,6 +40,11 @@
           %strong
             = @group.created_at.to_s(:medium)
 
+        %li
+          %span.light= _('ID:')
+          %strong
+            = @group.id
+
         = render_if_exists 'admin/namespace_plan_info', namespace: @group
 
         %li

app/views/admin/projects/show.html.haml

@@ -54,6 +54,11 @@
           %strong
             = @project.created_at.to_s(:medium)
 
+        %li
+          %span.light ID:
+          %strong
+            = @project.id
+
         %li
           %span.light http:
           %strong

changelogs/unreleased/60948-display-groupid-on-group-admin-page.yml

+---
+title: Display group id on group admin page
+merge_request: 29735
+author: Zsolt Kovari
+type: added

changelogs/unreleased/60949-display-projectid-on-project-admin-page.yml

+---
+title: Display project id on project admin page
+merge_request: 29734
+author: Zsolt Kovari
+type: added

doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md

@@ -15,6 +15,12 @@ GitLab does it for you, out-of-the-box.
 [Let's Encrypt](https://letsencrypt.org) is a free, automated, and
 open source Certificate Authority.
 
+CAUTION: **Caution:**
+This feature is in **beta** and might present bugs and UX issues
+such as [#64870](https://gitlab.com/gitlab-org/gitlab-ce/issues/64870).
+See all the related issues linked from this [issue's description](https://gitlab.com/gitlab-org/gitlab-ce/issues/28996)
+for more information.
+
 ## Requirements
 
 Before you can enable automatic provisioning of a SSL certificate for your domain, make sure you have:
@@ -55,9 +61,22 @@ associated Pages domain. It will be also renewed automatically by GitLab.
 > - If you already have SSL certificate in domain settings it
 >   will continue to work until it will be replaced by Let's Encrypt's certificate.
 
-<!-- ## Troubleshooting
+## Troubleshooting
+
+### Error "Certificate misses intermediates"
+
+If you get an error **Certificate misses intermediates** while trying to enable Let's Encrypt integration for your domain, follow the steps below:
+
+1. Go to your project's **Settings > Pages**.
+1. Turn off **Force HTTPS** if it's turned on.
+1. Click **Details** on your domain.
+1. Click the **Edit** button in the top right corner of domain details page.
+1. Enable Let's Encrypt integration.
+1. Click **Save**.
+1. Go to your project's **Settings > Pages**.
+1. Turn on **Force HTTPS**.
 
-Include any troubleshooting steps that you can foresee. If you know beforehand what issues
+<!-- Include any troubleshooting steps that you can foresee. If you know beforehand what issues
 one might have when setting this up, or when something is changed, or on upgrading, it's
 important to describe those, too. Think of things that may go wrong and include them here.
 This is important to minimize requests for support, and to avoid doc comments with

spec/features/admin/admin_groups_spec.rb

@@ -90,6 +90,7 @@ describe 'Admin Groups' do
       visit admin_group_path(group)
 
       expect(page).to have_content("Group: #{group.name}")
+      expect(page).to have_content("ID: #{group.id}")
     end
   end
 

spec/features/admin/admin_projects_spec.rb

@@ -60,6 +60,7 @@ describe "Admin::Projects" do
       expect(page).to have_content(project.name)
       expect(page).to have_content(project.full_name)
       expect(page).to have_content(project.creator.name)
+      expect(page).to have_content(project.id)
     end
   end