Automatic merge of gitlab-org/gitlab-ce master

GITALY_SERVER_VERSION

-1.28.0
+1.27.0

Gemfile

@@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.2.0'
 gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'rack-oauth2', '~> 1.9.3'
 gem 'jwt', '~> 2.1.0'
 
 # Kerberos authentication. EE-only

Gemfile.lock

@@ -65,7 +65,7 @@ GEM
     atomic (1.1.99)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
-    attr_required (1.0.0)
+    attr_required (1.0.1)
     awesome_print (1.8.0)
     aws-sdk (2.9.32)
       aws-sdk-resources (= 2.9.32)
@@ -652,12 +652,12 @@ GEM
     rack-attack (4.4.1)
       rack
     rack-cors (1.0.2)
-    rack-oauth2 (1.2.3)
-      activesupport (>= 2.3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
-      multi_json (>= 1.3.6)
-      rack (>= 1.1)
+    rack-oauth2 (1.9.3)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.9.0)
+      rack
     rack-protection (2.0.5)
       rack
     rack-proxy (0.6.0)
@@ -1142,7 +1142,7 @@ DEPENDENCIES
   rack (= 2.0.6)
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
-  rack-oauth2 (~> 1.2.1)
+  rack-oauth2 (~> 1.9.3)
   rack-proxy (~> 0.6.0)
   rails (= 5.0.7.1)
   rails-controller-testing

changelogs/unreleased/gitaly-version-v1.28.0.yml

----
-title: Upgrade to Gitaly v1.28.0
-merge_request: 26026
-author:
-type: changed

changelogs/unreleased/update-rack-oauth2.yml

+---
+title: Update rack-oauth2 1.2.1 -> 1.9.3
+merge_request: 17868
+author:
+type: other