diff options
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 102 |
1 files changed, 54 insertions, 48 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 979c046..ea71251 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,44 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.10) - actionpack (= 4.0.10) + actionmailer (4.1.9) + actionpack (= 4.1.9) + actionview (= 4.1.9) mail (~> 2.5, >= 2.5.4) - actionpack (4.0.10) - activesupport (= 4.0.10) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionpack (4.1.9) + actionview (= 4.1.9) + activesupport (= 4.1.9) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.10) - activesupport (= 4.0.10) - builder (~> 3.1.0) - activerecord (4.0.10) - activemodel (= 4.0.10) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.10) - arel (~> 4.0.0) + actionview (4.1.9) + activesupport (= 4.1.9) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.9) + activesupport (= 4.1.9) + builder (~> 3.1) + activerecord (4.1.9) + activemodel (= 4.1.9) + activesupport (= 4.1.9) + arel (~> 5.0.0) activerecord-deprecated_finders (1.0.3) activerecord-session_store (0.1.0) actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activesupport (4.0.10) + activesupport (4.1.9) i18n (~> 0.6, >= 0.6.9) - minitest (~> 4.2) - multi_json (~> 1.3) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) + tzinfo (~> 1.1) acts-as-taggable-on (3.4.3) activerecord (>= 3.2, < 5) addressable (2.3.5) annotate (2.6.0) activerecord (>= 2.3.0) rake (>= 0.8.7) - arel (4.0.2) + arel (5.0.1.20140414130214) ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) @@ -44,7 +47,7 @@ GEM ice_nine (~> 0.9) bootstrap-sass (3.0.3.0) sass (~> 3.2) - builder (3.1.4) + builder (3.2.2) byebug (3.2.0) columnize (~> 0.8) debugger-linecache (~> 1.2) @@ -131,19 +134,19 @@ GEM guard-rspec (4.2.0) guard (>= 2.1.1) rspec (>= 2.14, < 4.0) - haml (4.0.4) + haml (4.0.6) tilt - haml-rails (0.5.2) - actionpack (~> 4.0.1) - activesupport (~> 4.0.1) + haml-rails (0.5.3) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) haml (>= 3.1, < 5.0) - railties (~> 4.0.1) + railties (>= 4.0.1) hashie (2.0.5) hike (1.2.3) httparty (0.11.0) multi_json (~> 1.0) multi_xml (>= 0.5.2) - i18n (0.6.11) + i18n (0.7.0) ice_nine (0.11.0) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -151,7 +154,7 @@ GEM jquery-turbolinks (2.0.1) railties (>= 3.1.0) turbolinks - json (1.8.1) + json (1.8.2) jwt (1.2.0) kaminari (0.15.0) actionpack (>= 3.0.0) @@ -167,12 +170,12 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.4) - mail (2.6.1) + mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (2.4.1) + mime-types (2.4.3) mini_portile (0.5.2) - minitest (4.3.2) + minitest (5.5.1) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) @@ -196,7 +199,7 @@ GEM multi_json (~> 1.0) websocket-driver (>= 0.2.0) powerpack (0.0.9) - protected_attributes (1.0.5) + protected_attributes (1.0.8) activemodel (>= 4.0.1, < 5.0) pry (0.9.12.4) coderay (~> 1.0) @@ -213,24 +216,26 @@ GEM rack (>= 1.0.0) rack-protection (1.5.1) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.10) - actionmailer (= 4.0.10) - actionpack (= 4.0.10) - activerecord (= 4.0.10) - activesupport (= 4.0.10) + rails (4.1.9) + actionmailer (= 4.1.9) + actionpack (= 4.1.9) + actionview (= 4.1.9) + activemodel (= 4.1.9) + activerecord (= 4.1.9) + activesupport (= 4.1.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.10) + railties (= 4.1.9) sprockets-rails (~> 2.0) - railties (4.0.10) - actionpack (= 4.0.10) - activesupport (= 4.0.10) + railties (4.1.9) + actionpack (= 4.1.9) + activesupport (= 4.1.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) raindrops (0.13.0) - rake (10.3.2) + rake (10.4.2) rb-fsevent (0.9.3) rb-inotify (0.9.2) ffi (>= 0.5.0) @@ -300,10 +305,10 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.4) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) stamp (0.5.0) state_machine (1.2.0) temple (0.6.7) @@ -319,7 +324,8 @@ GEM tins (0.13.1) turbolinks (2.0.0) coffee-rails - tzinfo (0.3.41) + tzinfo (1.2.2) + thread_safe (~> 0.1) uglifier (2.3.2) execjs (>= 0.3.0) json (>= 1.8.0) @@ -366,13 +372,13 @@ DEPENDENCIES grape-entity growl guard-rspec - haml-rails + haml-rails (~> 0.5.3) httparty (= 0.11.0) jquery-rails jquery-turbolinks kaminari letter_opener - minitest (= 4.3.2) + minitest mysql2 nested_form nprogress-rails @@ -383,7 +389,7 @@ DEPENDENCIES pry quiet_assets rack-mini-profiler - rails (= 4.0.10) + rails (= 4.1.9) rake rb-fsevent rb-inotify |