diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 12:00:08 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 12:00:08 +0000 |
| commit | 36fd2e2e2c7b7316e5f547dfb2fb3784ec2262ca (patch) | |
| tree | 0ad6b0e92dba57981d733cbaee767e1da4289579 | |
| parent | 5ac590677f4518d40070ba797874439dcf4a6227 (diff) | |
| parent | 9e26c0de851d9ef7f9361f4386b8ac74e8b40e2e (diff) | |
| download | gitlab-ce-36fd2e2e2c7b7316e5f547dfb2fb3784ec2262ca.tar.gz | |
Merge branch '27488-fix-jwt-version' into 'master'
Update and pin the `jwt` gem to ~> 1.5.6
Closes #27488
See merge request !8900
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/27488-fix-jwt-version.yml | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -36,7 +36,7 @@ gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.2.0' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt' +gem 'jwt', '~> 1.5.6' # Spam and anti-bot protection gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' diff --git a/Gemfile.lock b/Gemfile.lock index 671d7788a86..3b207d19d1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -379,7 +379,7 @@ GEM json (1.8.3) json-schema (2.6.2) addressable (~> 2.3.8) - jwt (1.5.4) + jwt (1.5.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -912,7 +912,7 @@ DEPENDENCIES jquery-rails (~> 4.1.0) jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) - jwt + jwt (~> 1.5.6) kaminari (~> 0.17.0) knapsack (~> 1.11.0) kubeclient (~> 2.2.0) @@ -1022,4 +1022,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.7 + 1.14.2 diff --git a/changelogs/unreleased/27488-fix-jwt-version.yml b/changelogs/unreleased/27488-fix-jwt-version.yml new file mode 100644 index 00000000000..5135ff0fd60 --- /dev/null +++ b/changelogs/unreleased/27488-fix-jwt-version.yml @@ -0,0 +1,4 @@ +--- +title: Update and pin the `jwt` gem to ~> 1.5.6 +merge_request: +author: |