Automatic merge of gitlab-org/gitlab master

app/assets/stylesheets/pages/editor.scss

@@ -74,14 +74,10 @@
     justify-content: flex-end;
   }
 
-  .encoding-selector,
   .soft-wrap-toggle {
     display: inline-block;
     vertical-align: top;
     font-family: $regular-font;
-  }
-
-  .soft-wrap-toggle {
     margin: 0 $btn-side-margin;
 
     .soft-wrap {
@@ -128,15 +124,6 @@
         margin: 3px 0;
       }
 
-      .encoding-selector {
-        display: block;
-        margin: 3px 0;
-
-        button {
-          width: 100%;
-        }
-      }
-
       @media(max-width: map-get($grid-breakpoints, md)-1) {
         clear: both;
       }

app/views/projects/blob/_editor.html.haml

@@ -36,8 +36,6 @@
         %span.soft-wrap
           = custom_icon('icon_soft_wrap')
           Soft wrap
-      .encoding-selector
-        = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2', tabindex: '-1'
 
   .file-editor.code
     .js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true } }<

changelogs/unreleased/296645-removed-unused-dropdown.yml

+---
+title: Removed unused Text dropdown
+merge_request: 53464
+author:
+type: removed

doc/.vale/gitlab/Acronyms.yml

@@ -143,6 +143,7 @@ exceptions:
   - SVG
   - SVN
   - TCP
+  - TIFF
   - TIP
   - TLD
   - TLS

doc/administration/geo/replication/index.md

----
-redirect_to: '../index.md'
----
-
-This document was moved to [another location](../index.md).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/development/api_graphql_styleguide.md

@@ -13,6 +13,7 @@ This document outlines the style guide for the GitLab [GraphQL API](../api/graph
 <!-- vale gitlab.Spelling = NO -->
 We use the [GraphQL Ruby gem](https://graphql-ruby.org/) written by [Robert Mosolgo](https://github.com/rmosolgo/).
 <!-- vale gitlab.Spelling = YES -->
+In addition, we have a subscription to [GraphQL Pro](https://www.graphql.pro). For details see [GraphQL Pro subscription](graphql_guide/graphql_pro.md).
 
 All GraphQL queries are directed to a single endpoint
 ([`app/controllers/graphql_controller.rb#execute`](https://gitlab.com/gitlab-org/gitlab/blob/master/app%2Fcontrollers%2Fgraphql_controller.rb)),

doc/development/graphql_guide/graphql_pro.md

+---
+stage: Plan
+group: Project Management
+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
+---
+
+# GraphQL Pro
+
+GraphQL has become a key technology in GitLab and is implemented using the 
+[GraphQL Ruby gem](https://graphql-ruby.org). As such, we've purchased a subscription to
+[GraphQL Pro](https://graphql.pro).
+
+The main purpose is for support. Per the website:
+
+> As a GraphQL::Pro customer, you get direct access to the GraphQL Ruby gem
+> creator and maintainer. Get prioritized support for issues and requests.
+
+Note that we **cannot** use the Pro version directly in our product, since we are 
+an Open Core product - we can not require customers to purchase the Pro version, nor can we ship it.
+
+Details on the billing account and gem licensing can be found in the Engineering 1Password vault.

doc/development/graphql_guide/index.md

 ---
-stage: none
-group: unassigned
+stage: Plan
+group: Project Management
 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
 ---
 
@@ -17,3 +17,6 @@ feedback, and suggestions.
 - [GraphQL API documentation style guide](../documentation/graphql_styleguide.md): documentation
   style guide for GraphQL.
 - [GraphQL API](../../api/graphql/index.md): user documentation for the GitLab GraphQL API.
+- [GraphQL BatchLoader](batchloader.md): development documentation on the batchloader.
+- [GraphQL pagination](pagination.md): development documentation on pagination.
+- [GraphQL Pro](graphql_pro.md): information on our GraphQL Pro subscription.

doc/development/graphql_guide/pagination.md

 ---
-stage: none
-group: unassigned
+stage: Plan
+group: Project Management
 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
 ---
 

doc/user/profile/account/index.md

----
-redirect_to: '../index.md#user-settings'
----
-
-This document was moved to [../index.md#user-settings](../index.md#user-settings).
-
-<!-- This redirect file can be deleted after February 1, 2021. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->