Automatic merge of gitlab-org/gitlab-ce master

GITALY_SERVER_VERSION

-1.13.0
+1.14.0
\ No newline at end of file

app/models/label.rb

@@ -214,6 +214,7 @@ class Label < ActiveRecord::Base
     super(options).tap do |json|
       json[:type] = self.try(:type)
       json[:priority] = priority(options[:project]) if options.key?(:project)
+      json[:textColor] = text_color
     end
   end
 

changelogs/unreleased/53714-inconsistent-text-color-for-labels.yml

+---
+title: Fix foreground color for labels to ensure consistency of label appearance
+merge_request: 23873
+author: Nathan Friend
+type: fixed

doc/development/automatic_ce_ee_merge.md

@@ -148,7 +148,7 @@ merge commit SHA is `138f5e2f20289bb376caffa0303adb0cac859ce1`:
 - To cherry-pick multiple commits, such as B and D in a range [A > B > C > D], use:
 
     ```shell
-    git cherry-pick commmit-B-SHA commit-D-SHA
+    git cherry-pick commit-B-SHA commit-D-SHA
     ```
 
     For example, suppose commit B SHA = `4f5e4018c09ed797fdf446b3752f82e46f5af502`,
@@ -213,7 +213,7 @@ being able to deploy.
 No, not if there is an EE merge request for every CE merge request that causes
 conflicts _and_ that EE merge request is merged first. In the past we may have
 been a bit more relaxed when it comes to enforcing EE merge requests, but to
-enable automatic merging have to start requiring such merge requests even for
+enable automatic merging we have to start requiring such merge requests even for
 the smallest conflicts.
 
 ### Some files I work with often conflict, how can I best deal with this?

doc/user/project/index.md

@@ -175,7 +175,7 @@ When [renaming a user](../profile/index.md#changing-your-username),
 
 Any project can be used as a Go package including private projects in subgroups. To use packages
 hosted in private projects with the `go get` command, use a [`.netrc` file](https://ec.haxx.se/usingcurl-netrc.html)
-and a personal access token in the password field.
+and a [personal access token](../profile/personal_access_tokens.md) in the password field.
 
 For example:
 

spec/requests/api/submodules_spec.rb

@@ -64,7 +64,7 @@ describe API::Submodules do
         expect(response).to have_gitlab_http_status(400)
       end
 
-      it 'returns the commmit' do
+      it 'returns the commit' do
         head_commit = project.repository.commit.id
 
         put api(route(submodule), user), params: params
@@ -81,7 +81,7 @@ describe API::Submodules do
         let(:branch) { 'submodule_inside_folder' }
         let(:encoded_submodule) { CGI.escape(submodule) }
 
-        it 'returns the commmit' do
+        it 'returns the commit' do
           expect(Submodules::UpdateService)
             .to receive(:new)
                   .with(any_args, hash_including(submodule: submodule))