Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -225,7 +225,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
 gem 'hipchat', '~> 1.5.0'
 
 # Jira integration
-gem 'jira-ruby', '~> 1.4'
+gem 'jira-ruby', '~> 1.7'
 
 # Flowdock integration
 gem 'flowdock', '~> 0.7'

Gemfile.lock

@@ -74,6 +74,8 @@ GEM
     asciidoctor-plantuml (0.0.9)
       asciidoctor (>= 1.5.6, < 3.0.0)
     ast (2.4.0)
+    atlassian-jwt (0.2.0)
+      jwt (~> 2.1.0)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
@@ -471,8 +473,9 @@ GEM
       opentracing (~> 0.3)
       thrift
     jaro_winkler (1.5.3)
-    jira-ruby (1.4.1)
+    jira-ruby (1.7.1)
       activesupport
+      atlassian-jwt
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jmespath (1.3.1)
@@ -1161,7 +1164,7 @@ DEPENDENCIES
   icalendar
   influxdb (~> 0.2)
   invisible_captcha (~> 0.12.1)
-  jira-ruby (~> 1.4)
+  jira-ruby (~> 1.7)
   js_regex (~> 3.1)
   json-schema (~> 2.8.0)
   jwt (~> 2.1.0)

config/dependency_decisions.yml

@@ -606,3 +606,10 @@
     :why: https://github.com/egonSchiele/contracts.ruby/blob/master/LICENSE
     :versions: []
     :when: 2019-04-01 11:29:39.361015000 Z
+- - :license
+  - atlassian-jwt
+  - Apache 2.0
+  - :who: Takuya Noguchi
+    :why: https://bitbucket.org/atlassian/atlassian-jwt-ruby/src/master/LICENSE.txt
+    :versions: []
+    :when: 2019-08-30 05:45:35.317663000 Z

vendor/licenses.csv

@@ -152,6 +152,7 @@ assert,1.4.1,MIT
 assign-symbols,1.0.0,MIT
 async-each,1.0.1,MIT
 async-limiter,1.0.0,MIT
+atlassian-jwt,0.2.0,Apache 2.0
 atob,2.1.2,(MIT OR Apache-2.0)
 atomic,1.1.99,Apache 2.0
 attr_encrypted,3.1.0,MIT