diff --git a/Gemfile.lock b/Gemfile.lock index 925e7c6a..d87d3e23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM acts_as_tree (1.5.0) activerecord (>= 3.0.0) arel (4.0.2) - atomic (1.1.15) + atomic (1.1.16) better_errors (1.1.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -145,7 +145,7 @@ GEM nokogiri (~> 1.6.0) rails (>= 3.1) diff-lcs (1.2.5) - diffy (3.0.2) + diffy (3.0.3) docile (1.1.3) erubis (2.7.0) eventmachine (1.0.3) @@ -208,23 +208,23 @@ GEM sqlite3-ruby thin mime-types (1.25.1) - mini_portile (0.5.2) + mini_portile (0.5.3) minitest (4.7.5) mono_logger (1.1.0) - multi_json (1.9.0) + multi_json (1.9.2) mysql2 (0.3.15) net-scp (1.1.2) net-ssh (>= 2.6.5) net-ssh (2.8.0) nokogiri (1.6.1) mini_portile (~> 0.5.0) - pdf-core (0.1.6) + pdf-core (0.2.5) polyamorous (0.6.4) activerecord (>= 3.0) polyglot (0.3.4) - prawn (0.15.0) - pdf-core (~> 0.1.3) - ttfunk (~> 1.1.0) + prawn (1.0.0) + pdf-core (~> 0.2.2) + ttfunk (~> 1.1.1) protected_attributes (1.0.7) activemodel (>= 4.0.1, < 5.0) quiet_assets (1.0.2) @@ -244,9 +244,9 @@ GEM sprockets-rails (~> 2.0.0) rails-assets-listjs (0.2.0.beta.4) railties (>= 3.1) - rails-i18n (4.0.1) + rails-i18n (4.0.2) i18n (~> 0.6) - rails (~> 4.0) + rails (>= 4.0) rails-settings-cached (0.3.1) rails (>= 4.0.0.beta1) railties (4.0.4) @@ -254,7 +254,7 @@ GEM activesupport (= 4.0.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.1) + rake (10.2.0) ransack (1.1.0) actionpack (>= 3.0) activerecord (>= 3.0) @@ -282,7 +282,7 @@ GEM rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.6) - rspec-rails (2.14.1) + rspec-rails (2.14.2) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) @@ -294,8 +294,8 @@ GEM rspec (>= 2.11.0) ruby-prof (0.14.2) ruby-units (1.4.5) - rubyzip (1.1.0) - sass (3.2.15) + rubyzip (1.1.2) + sass (3.2.18) sass-rails (4.0.2) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) @@ -308,7 +308,7 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) - simple-navigation (3.12.2) + simple-navigation (3.13.0) activesupport (>= 2.3.2) simple-navigation-bootstrap (1.0.0) railties (>= 3.1) @@ -353,11 +353,11 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.18.1) - thread_safe (0.2.0) + thor (0.19.1) + thread_safe (0.3.1) atomic (>= 1.1.7, < 2) tilt (1.4.1) - tins (1.0.0) + tins (1.0.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1)