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 @@ -34,7 +34,7 @@ gem 'rmagick', '2.13.2'
gem 'carrierwave', '0.9.0'
gem 'gon', '5.0.4'
gem 'haml-rails'
gem 'jquery-rails', '3.1.0'
gem 'jquery-rails', '3.1.3'
gem 'friendly_id'
gem 'simple_form', '2.1.1'
gem 'kaminari', '0.15.1'
Expand Down
25 changes: 12 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,27 @@ GEM
hike (1.2.3)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (3.1.0)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
json (2.2.0)
kaminari (0.15.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
multi_json (1.8.4)
multi_json (1.14.1)
newrelic_rpm (3.7.2.195)
pg (0.17.1)
polyglot (0.3.4)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
Expand All @@ -105,9 +105,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
rake (13.0.0)
rdoc (3.9.5)
rmagick (2.13.2)
sass (3.2.14)
sass-rails (3.2.6)
Expand All @@ -117,13 +116,13 @@ GEM
simple_form (2.1.1)
actionpack (~> 3.0)
activemodel (~> 3.0)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.8)
thor (0.18.1)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
Expand All @@ -145,7 +144,7 @@ DEPENDENCIES
friendly_id
gon (= 5.0.4)
haml-rails
jquery-rails (= 3.1.0)
jquery-rails (= 3.1.3)
kaminari (= 0.15.1)
newrelic_rpm
pg
Expand Down