diff --git a/Gemfile b/Gemfile index 2e3ed4b15..e925fb642 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem 'ckeditor', '~> 4.1.5' gem 'cancancan' gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc' gem 'initialjs-rails', '0.2.0.1' -gem 'unicorn', '~> 5.0.1' +gem 'unicorn', '~> 5.1.0' gem 'paranoia' gem 'rinku', require: 'rails_rinku' gem 'savon' @@ -59,7 +59,6 @@ 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 diff --git a/Gemfile.lock b/Gemfile.lock index 24494af00..755561fb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,7 +234,7 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.0.2) - newrelic_rpm (3.15.0.314) + newrelic_rpm (3.15.1.316) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) @@ -310,12 +310,12 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.15.0) - rake (11.1.1) + raindrops (0.16.0) + rake (11.1.2) redcarpet (3.3.4) referer-parser (0.3.0) request_store (1.3.0) - responders (2.1.1) + responders (2.1.2) railties (>= 4.2.0, < 5.1) rinku (1.7.3) rollbar (2.8.3) @@ -395,17 +395,16 @@ GEM safe_yaml (>= 0.8.6) turbolinks (2.5.3) coffee-rails - turnout (2.2.1) + turnout (2.3.0) rack (~> 1.3) rack-accept (~> 0.4) + tilt (>= 1.4, < 3) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unicorn (5.0.1) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) uniform_notifier (1.9.0) user_agent_parser (2.3.0) @@ -465,7 +464,6 @@ DEPENDENCIES initialjs-rails (= 0.2.0.1) jquery-rails jquery-ui-rails - jwt (~> 1.5.4) kaminari launchy letter_opener_web (~> 1.3.0) @@ -495,7 +493,7 @@ DEPENDENCIES turbolinks turnout uglifier (>= 1.3.0) - unicorn (~> 5.0.1) + unicorn (~> 5.1.0) web-console (~> 3.0) whenever