diff --git a/Gemfile.lock b/Gemfile.lock index 3d598b81..84e9eab8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM arbre (1.0.3) activesupport (>= 3.0.0) arel (6.0.3) - ast (2.1.0) + ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) bcrypt (3.1.10) @@ -98,9 +98,9 @@ GEM byebug (8.2.1) chunky_png (1.3.5) coderay (1.1.0) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs @@ -117,9 +117,9 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - compass-rails (2.0.5) + compass-rails (2.0.4) compass (~> 1.0.0) - sass-rails (< 5.1) + sass-rails (<= 5.0.1) sprockets (< 2.13) debug_inspector (0.0.2) devise (3.5.3) @@ -153,7 +153,7 @@ GEM formtastic (3.1.3) actionpack (>= 3.2.13) formtastic_i18n (0.4.1) - geocoder (1.2.12) + geocoder (1.2.13) globalid (0.3.6) activesupport (>= 4.1.0) guard (2.13.0) @@ -268,13 +268,13 @@ GEM mysql2 (0.3.20) naught (1.1.0) nenv (0.2.0) - nokogiri (1.6.7) + nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - paper_trail (4.0.0) + paper_trail (4.0.1) activerecord (>= 3.0, < 6.0) activesupport (>= 3.0, < 6.0) request_store (~> 1.1) @@ -336,8 +336,8 @@ GEM redcarpet (3.3.3) ref (2.0.0) request_store (1.2.1) - responders (2.1.0) - railties (>= 4.2.0, < 5) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) rubocop (0.35.1) astrolabe (~> 1.3) parser (>= 2.2.3.0, < 3.0) @@ -353,12 +353,12 @@ GEM sexp_processor (~> 4.1) safe_yaml (1.0.4) sass (3.4.20) - sass-rails (5.0.4) + sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + tilt (~> 1.1) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -378,7 +378,7 @@ GEM temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - spring (1.5.0) + spring (1.6.0) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -401,7 +401,7 @@ GEM thread_safe (0.3.5) tilt (1.4.1) tins (1.6.0) - tinymce-rails (4.3.1) + tinymce-rails (4.3.2) railties (>= 3.1.1) tinymce-rails-langs (4.20140129) tinymce-rails (~> 4.0)