Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
This commit is contained in:
commit
47b1e843ed
|
|
@ -44,7 +44,7 @@ gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
|
|||
gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
|
||||
gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'rubyzip', '1.2.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'recurly', '2.19.14' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
|
||||
gem 'redis', '3.3.0' # pinned until we are on 2.5; then remove
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
|
|||
gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
|
||||
gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'rubyzip', '1.2.1' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'recurly', '2.19.14' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
|
||||
gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
|
||||
|
|
|
|||
|
|
@ -619,7 +619,7 @@ GEM
|
|||
execjs
|
||||
rails (>= 3.2)
|
||||
tilt
|
||||
recurly (2.18.16)
|
||||
recurly (2.19.14)
|
||||
redis (3.3.3)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
|
|
@ -887,7 +887,7 @@ DEPENDENCIES
|
|||
rails-observers
|
||||
railties (= 4.2.8)
|
||||
react-rails (= 1.3.3)
|
||||
recurly (= 2.18.16)
|
||||
recurly (= 2.19.14)
|
||||
redis (= 3.3.3)
|
||||
redis-namespace (= 1.5.3)
|
||||
responders (~> 2.0)
|
||||
|
|
|
|||
Loading…
Reference in New Issue