Merge pull request #1012 from consul/jwt-gem

updates jwt gem
2016-03-28 11:37:38 +02:00
parent 4eb822a73c 7a141b8147
commit 1bbc12dc52
2 changed files with 3 additions and 1 deletions
--- a/1
+++ b/1
@@ -59,6 +59,7 @@ gem 'tolk' # Web interface for translations
 gem 'browser'
 gem 'turnout'
 gem 'redcarpet'
+gem 'jwt', '~> 1.5.4'

 group :development, :test do
  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,7 +208,7 @@ GEM
    jquery-ui-rails (5.0.5)
      railties (>= 3.2.16)
    json (1.8.3)
-    jwt (1.5.3)
+    jwt (1.5.4)
    kaminari (0.16.3)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
@@ -465,6 +465,7 @@ DEPENDENCIES
  initialjs-rails (= 0.2.0.1)
  jquery-rails
  jquery-ui-rails
+  jwt (~> 1.5.4)
  kaminari
  launchy
  letter_opener_web (~> 1.3.0)