Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 9 insertions, 20 deletions

diff --git a/doc/downgrade_ee_to_ce/README.md b/doc/downgrade_ee_to_ce/README.md
index 2561ee875d2..3cbc68d61ed 100644
--- a/doc/downgrade_ee_to_ce/README.md
+++ b/doc/downgrade_ee_to_ce/README.md
@@ -1,7 +1,7 @@
 ---
 stage: none
 group: unassigned
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
 # Downgrading from EE to CE
@@ -23,20 +23,8 @@ alternative authentication methods to your users.
 
 ### Remove Service Integration entries from the database
 
-The `JenkinsService` and `GithubService` classes are only available in the Enterprise Edition codebase,
-so if you downgrade to the Community Edition, you'll come across the following
-error:
-
-```plaintext
-Completed 500 Internal Server Error in 497ms (ActiveRecord: 32.2ms)
-
-ActionView::Template::Error (The single-table inheritance mechanism failed to locate the subclass: 'JenkinsService'. This
-error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this
-column if you didn't intend it to be used for storing the inheritance class or overwrite Service.inheritance_column to
-use another column for that information.)
-```
-
-or
+The `GithubService` class is only available in the Enterprise Edition codebase,
+so if you downgrade to the Community Edition, the following error displays:
 
 ```plaintext
 Completed 500 Internal Server Error in 497ms (ActiveRecord: 32.2ms)
@@ -49,22 +37,23 @@ use another column for that information.)
 
 All services are created automatically for every project you have, so in order
 to avoid getting this error, you need to remove all instances of the
-`JenkinsService` and `GithubService` from your database:
+`GithubService` from your database:
 
 **Omnibus Installation**
 
 ```shell
-sudo gitlab-rails runner "Service.where(type: ['JenkinsService', 'GithubService']).delete_all"
+sudo gitlab-rails runner "Service.where(type: ['GithubService']).delete_all"
 ```
 
 **Source Installation**
 
 ```shell
-bundle exec rails runner "Service.where(type: ['JenkinsService', 'GithubService']).delete_all" production
+bundle exec rails runner "Service.where(type: ['GithubService']).delete_all" production
 ```
 
-NOTE: **Note:**
-If you are running `GitLab =< v13.0` you need to also remove `JenkinsDeprecatedService` records.
+NOTE:
+If you are running `GitLab =< v13.0` you need to also remove `JenkinsDeprecatedService` records
+and if you are running `GitLab =< v13.6` you need to also remove `JenkinsService` records.
 
 ### Variables environment scopes