diff --git a/.travis.yml b/.travis.yml index 418777e..a674129 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +before_install: gem install bundler --pre language: ruby rvm: - 1.9.2 @@ -6,7 +7,7 @@ before_install: - gem update --system - gem --version env: - - RAILS=3.2.8 + - RAILS=3.2.12 script: - RAILS_ENV=test bundle exec rake --trace db:migrate - bundle exec rake db:test:prepare diff --git a/Gemfile.lock b/Gemfile.lock index 2f74ef6..171471a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,32 +30,32 @@ GEM multi_json (~> 1.0) acts-as-taggable-on (2.3.3) rails (~> 3.0) - addressable (2.3.2) + addressable (2.3.3) arel (3.0.2) bourne (1.1.2) mocha (= 0.10.5) builder (3.0.4) - capybara (2.0.1) + capybara (2.0.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 1.0.0) - childprocess (0.3.6) - ffi (~> 1.0, >= 1.0.6) + childprocess (0.3.9) + ffi (~> 1.0, >= 1.0.11) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.1) daemons (1.1.9) database_cleaner (0.7.2) diff-lcs (1.1.3) erubis (2.7.0) - eventmachine (1.0.0) + eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.1.0) @@ -65,51 +65,49 @@ GEM railties (>= 3.0.0) faker (1.1.2) i18n (~> 0.5) - faraday (0.8.4) + faraday (0.8.6) multipart-post (~> 1.1) - ffi (1.2.0) + ffi (1.4.0) friendly_id (4.0.9) - geocoder (1.1.5) - github_api (0.8.2) + geocoder (1.1.6) + github_api (0.9.0) faraday (~> 0.8.1) hashie (~> 1.2.0) multi_json (~> 1.4) nokogiri (~> 1.5.2) oauth2 - gon (4.0.1) + gon (4.0.2) actionpack (>= 2.3.0) json - haml (3.1.7) - haml-rails (0.3.5) + haml (4.0.0) + tilt + haml-rails (0.4) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) - haml (~> 3.1) + haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hashie (1.2.0) hike (1.2.1) httpauth (0.2.0) - i18n (0.6.1) + i18n (0.6.4) jasminerice (0.0.10) coffee-rails haml journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (2.0.2) + jquery-ui-rails (4.0.1) jquery-rails railties (>= 3.1.0) json (1.7.7) - jwt (0.1.5) - multi_json (>= 1.0) + jwt (0.1.7) + multi_json (>= 1.5) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - launchy (2.1.2) + launchy (2.2.0) addressable (~> 2.3) - libwebsocket (0.1.7.1) - addressable - websocket mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -118,20 +116,20 @@ GEM mime-types (1.21) mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.5.1) - multipart-post (1.1.5) - newrelic_rpm (3.5.3.25) - nokogiri (1.5.5) - oauth2 (0.8.0) + multi_json (1.6.1) + multipart-post (1.2.0) + newrelic_rpm (3.5.8.72) + nokogiri (1.5.6) + oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - omniauth (1.1.1) + omniauth (1.1.3) hashie (~> 1.2) rack - omniauth-github (1.0.3) + omniauth-github (1.1.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) omniauth-oauth2 (1.1.1) @@ -141,8 +139,8 @@ GEM polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) - quiet_assets (1.0.1) - railties (~> 3.1) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) @@ -166,17 +164,17 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - ransack (0.7.0) + ransack (0.7.2) actionpack (~> 3.0) activerecord (~> 3.0) polyamorous (~> 0.5.0) - rdoc (3.12.1) + rdoc (3.12.2) json (~> 1.4) - rspec-core (2.12.1) - rspec-expectations (2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.12.0) - rspec-rails (2.12.0) + rspec-mocks (2.12.2) + rspec-rails (2.12.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -184,16 +182,16 @@ GEM rspec-expectations (~> 2.12.0) rspec-mocks (~> 2.12.0) rubyzip (0.9.9) - sass (3.2.3) - sass-rails (3.2.5) + sass (3.2.7) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.27.2) + selenium-webdriver (2.31.0) childprocess (>= 0.2.5) - libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + websocket (~> 1.0.4) shoulda-matchers (1.4.2) activesupport (>= 3.0.0) bourne (~> 1.1.2) @@ -206,21 +204,21 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) + sqlite3 (1.3.7) thin (1.5.0) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.17.0) - tilt (1.3.3) + tilt (1.3.5) treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) + tzinfo (0.3.36) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - websocket (1.0.4) + websocket (1.0.7) xpath (1.0.0) nokogiri (~> 1.3)