Automatic merge of gitlab-org/gitlab master

doc/development/internal_api.md

@@ -529,7 +529,7 @@ POST /namespaces/:id/gitlab_subscription
 Example request:
 
 ```shell
-curl --request POST --header "TOKEN: <admin_access_token>" "https://gitlab.com/api/v4/namespaces/1234/gitlab_subscription?start_date="2020-07-15"&plan="silver"&seats=10"
+curl --request POST --header "TOKEN: <admin_access_token>" "https://gitlab.com/api/v4/namespaces/1234/gitlab_subscription?start_date="2020-07-15"&plan="premium"&seats=10"
 ```
 
 Example response:
@@ -537,8 +537,8 @@ Example response:
 ```json
 {
   "plan": {
-    "code":"silver",
-    "name":"Silver",
+    "code":"premium",
+    "name":"premium",
     "trial":false,
     "auto_renew":null,
     "upgradable":false
@@ -588,8 +588,8 @@ Example response:
 ```json
 {
   "plan": {
-    "code":"silver",
-    "name":"Silver",
+    "code":"premium",
+    "name":"premium",
     "trial":false,
     "auto_renew":null,
     "upgradable":false
@@ -627,8 +627,8 @@ Example response:
 ```json
 {
   "plan": {
-    "code":"silver",
-    "name":"Silver",
+    "code":"premium",
+    "name":"premium",
     "trial":false,
     "auto_renew":null,
     "upgradable":false

doc/user/project/repository/branches/default.md

@@ -57,9 +57,7 @@ GitLab administrators can configure a new default branch name at the
 ### Instance-level custom initial branch name **(FREE SELF)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/221013) in GitLab 13.2.
-> - It's deployed behind a feature flag, enabled by default.
-> - It cannot be enabled or disabled per-project.
-> - It's recommended for production use.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/325163) in GitLab 13.12.
 
 GitLab [administrators](../../../permissions.md) of self-managed instances can
 customize the initial branch for projects hosted on that instance. Individual