diff --git a/Gemfile b/Gemfile index 37a04aac..c85b496e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,6 @@ gem 'coffee-rails', '~>4.0' # add these gems to help with the transition: gem 'protected_attributes' -gem 'rails-observers' gem 'actionpack-xml_parser', github: 'rails/actionpack-xml_parser' # See https://github.com/sstephenson/execjs#readme for more supported runtimes diff --git a/Gemfile.lock b/Gemfile.lock index 1bc73ef0..4a4a408d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.0.17) + aasm (3.0.18) actionmailer (4.0.0.rc1) actionpack (= 4.0.0.rc1) mail (~> 2.5.3) @@ -37,8 +37,8 @@ GEM acts_as_list (0.2.0) activerecord (>= 3.0) arel (4.0.0) - aruba (0.5.2) - childprocess (~> 0.3.6) + aruba (0.5.3) + childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) atomic (1.1.9) @@ -64,7 +64,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.2) - cucumber (1.3.1) + cucumber (1.3.2) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12.0) @@ -73,7 +73,7 @@ GEM capybara (>= 1.1.2) cucumber (>= 1.1.8) nokogiri (>= 1.5.0) - database_cleaner (0.9.1) + database_cleaner (1.0.1) diff-lcs (1.2.4) erubis (2.7.0) execjs (1.4.0) @@ -93,14 +93,13 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) libv8 (3.11.8.17) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) mime-types (1.23) minitest (4.7.4) - mocha (0.13.3) + mocha (0.14.0) metaclass (~> 0.0.1) multi_json (1.7.3) mysql2 (0.3.11) @@ -121,8 +120,6 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.0.0.rc1) sprockets-rails (~> 2.0.0.rc4) - rails-observers (0.1.1) - railties (~> 4.0.0.beta) rails_autolink (1.1.0) rails (> 3.1) railties (4.0.0.rc1) @@ -131,7 +128,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.0.4) - ref (1.0.4) + ref (1.0.5) rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) rubyzip (0.9.9) @@ -153,7 +150,7 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - sprockets (2.9.3) + sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -181,7 +178,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) - uglifier (2.1.0) + uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) uniform_notifier (1.2.0) @@ -215,7 +212,6 @@ DEPENDENCIES protected_attributes rack-mini-profiler rails (= 4.0.0.rc1) - rails-observers rails_autolink rspec-expectations sanitize