diff --git a/Gemfile b/Gemfile index bbd179d1960..5e94baed6fd 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem 'seed-fu' , github: 'SamSaffron/seed-fu' if rails4? gem 'rails' # because of https://github.com/redis-store/redis-store/pull/183 - gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git' + gem 'redis-rails', :git => 'https://github.com/SamSaffron/redis-store.git' gem 'rails-observers' gem 'actionpack-action_caching' else @@ -119,7 +119,9 @@ gem 'sidekiq', '2.15.1' gem 'sidekiq-failures' gem 'sinatra', require: nil gem 'slim' # required for sidekiq-web -gem 'therubyracer', require: 'v8' + +# URGENT fix needed see: https://github.com/cowboyd/therubyracer/pull/280 +gem 'therubyracer', require: 'v8', git: 'https://github.com/SamSaffron/therubyracer.git' gem 'thin', require: false gem 'diffy', '>= 3.0', require: false gem 'highline', require: false diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index aa187115e33..7f7100dd121 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -1,12 +1,3 @@ -GIT - remote: git://github.com/SamSaffron/redis-store.git - revision: 1eafaa3d8bfbcb61ad89d1a2831adbba4ea8e1e1 - specs: - redis-rails (3.2.3) - redis-actionpack (>= 3.2.3) - redis-activesupport (>= 3.2.3) - redis-store (~> 1.1.0) - GIT remote: git://github.com/SamSaffron/seed-fu.git revision: 502c8b8514df3bf028c9231cc3a6ea3cff4f37f0 @@ -23,6 +14,23 @@ GIT rails (>= 3.0.0, < 5) spork (>= 1.0rc0) +GIT + remote: https://github.com/SamSaffron/redis-store.git + revision: 1eafaa3d8bfbcb61ad89d1a2831adbba4ea8e1e1 + specs: + redis-rails (3.2.3) + redis-actionpack (>= 3.2.3) + redis-activesupport (>= 3.2.3) + redis-store (~> 1.1.0) + +GIT + remote: https://github.com/SamSaffron/therubyracer.git + revision: 885ea08cb0bbe150e53d6d59ce60ef434245e6f3 + specs: + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) + ref + GIT remote: https://github.com/SamSaffron/vestal_versions revision: 007b30a5274db7db55da745a4482243559247782 @@ -405,9 +413,6 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) temple (0.6.7) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) - ref thin (1.6.1) daemons (>= 1.0.9) eventmachine (>= 1.0.0) @@ -521,7 +526,7 @@ DEPENDENCIES sinatra slim spork-rails! - therubyracer + therubyracer! thin timecop uglifier