diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-02 16:13:11 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-02 16:13:11 +0000 |
| commit | 1d3d12764897eb303fedeeb82d1b444c526ccb07 (patch) | |
| tree | fefe0ff17c40d3c2c4bb19be738810a14be70031 | |
| parent | f4e40c532b5582f47a0dd9bf7054112fc9ec6085 (diff) | |
| parent | 1fbe0fa1dc3bc75902a71188415d352adf33ca98 (diff) | |
| download | gitlab-ce-1d3d12764897eb303fedeeb82d1b444c526ccb07.tar.gz | |
Merge branch 'use-atlassian-jwt-gem-ce' into 'master'
[CE] Use atlassian-jwt-ruby gem
See merge request gitlab-org/gitlab-ce!32519
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -216,6 +216,7 @@ gem 'hipchat', '~> 1.5.0' # Jira integration gem 'jira-ruby', '~> 1.7' +gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration gem 'flowdock', '~> 0.7' diff --git a/Gemfile.lock b/Gemfile.lock index 0803cf7f752..c83f9b9076a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1028,6 +1028,7 @@ DEPENDENCIES asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-plantuml (= 0.0.9) + atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print babosa (~> 1.0.2) |