Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ gem 'redis'
gem 'hiredis'
gem 'readthis'
gem 'redis-dump'
gem 'yajl-ruby', '1.3.1'
gem 'yajl-ruby', '1.4.3'
gem 'redis-namespace'
gem 'redis-objects'

Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/rails-api/active_model_serializers.git
revision: 0b5a540e8d5a469b32e9809364c6d32daab1e6ac
remote: https://github.com/rails-api/active_model_serializers.git
revision: beeb216fab286537389788349c513264325393ef
specs:
active_model_serializers (1.0.0.pre.dev)

Expand Down Expand Up @@ -810,7 +810,7 @@ GEM
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
yajl-ruby (1.3.1)
yajl-ruby (1.4.3)
zip (2.0.2)

PLATFORMS
Expand Down Expand Up @@ -859,7 +859,7 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
yajl-ruby (= 1.3.1)
yajl-ruby (= 1.4.3)
zip

BUNDLED WITH
Expand Down