Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update dependencies.

  • Loading branch information...
commit 8c37f6af09b13253d18644810b5076c564a86daf 1 parent 464a7ac
@tristandunn tristandunn authored
Showing with 55 additions and 65 deletions.
  1. +4 −4 Gemfile
  2. +51 −61 Gemfile.lock
View
8 Gemfile
@@ -1,15 +1,15 @@
source "http://rubygems.org"
gem "bcrypt-ruby", "3.0.1", require: "bcrypt"
-gem "airbrake", "3.1.6"
+gem "airbrake", "3.1.8"
gem "pg", "0.14.1"
-gem "rails", "3.2.11"
+gem "rails", "3.2.12"
gem "rack-contrib", "1.1.0", require: "rack/contrib"
gem "will_paginate", "3.0.4"
gem "yajl-ruby", "1.1.0", require: "yajl"
group :assets do
- gem "bourbon", "3.0.1"
+ gem "bourbon", "3.1.0"
gem "sass-rails", "3.2.6"
gem "yui-compressor", "0.9.6"
end
@@ -22,7 +22,7 @@ group :test do
gem "bourne", "1.3.0"
gem "cucumber-rails", "1.3.0", require: false
gem "database_cleaner", "0.9.1"
- gem "factory_girl_rails", "4.1.0"
+ gem "factory_girl_rails", "4.2.1"
gem "rspec-rails", "2.12.2"
gem "shoulda-matchers", "1.4.1"
end
View
112 Gemfile.lock
@@ -5,40 +5,40 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.3.2)
- airbrake (3.1.6)
+ airbrake (3.1.8)
+ activesupport
builder
- girl_friday
+ json
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bourbon (3.0.1)
+ bourbon (3.1.0)
sass (>= 3.2.0)
thor
bourne (1.3.0)
@@ -51,9 +51,8 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
- connection_pool (1.0.0)
+ childprocess (0.3.8)
+ ffi (~> 1.0, >= 1.0.11)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@@ -66,68 +65,62 @@ GEM
database_cleaner (0.9.1)
diff-lcs (1.1.3)
erubis (2.7.0)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl_rails (4.2.1)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
ffi (1.3.1)
- gherkin (2.11.5)
- json (>= 1.4.6)
- girl_friday (0.11.2)
- connection_pool (~> 1.0)
- rubinius-actor
+ gherkin (2.11.6)
+ json (>= 1.7.6)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- json (1.7.6)
- libwebsocket (0.1.7.1)
- addressable
- websocket
+ json (1.7.7)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.19)
+ mime-types (1.21)
mocha (0.13.0)
metaclass (~> 0.0.1)
- multi_json (1.5.0)
+ multi_json (1.5.1)
nokogiri (1.5.6)
open4 (1.3.0)
pg (0.14.1)
polyglot (0.3.3)
- rack (1.4.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-contrib (1.1.0)
rack (>= 0.9.1)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
- rdoc (3.12)
+ rdoc (3.12.1)
json (~> 1.4)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.1)
+ rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -135,20 +128,17 @@ GEM
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
- rubinius-actor (0.0.2)
- rubinius-core-api
- rubinius-core-api (0.0.1)
rubyzip (0.9.9)
sass (3.2.5)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.27.2)
+ selenium-webdriver (2.29.0)
childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
+ websocket (~> 1.0.4)
shoulda-matchers (1.4.1)
activesupport (>= 3.0.0)
sprockets (2.2.2)
@@ -156,13 +146,13 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.16.0)
+ thor (0.17.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
- websocket (1.0.6)
+ websocket (1.0.7)
will_paginate (3.0.4)
xpath (1.0.0)
nokogiri (~> 1.3)
@@ -174,16 +164,16 @@ PLATFORMS
ruby
DEPENDENCIES
- airbrake (= 3.1.6)
+ airbrake (= 3.1.8)
bcrypt-ruby (= 3.0.1)
- bourbon (= 3.0.1)
+ bourbon (= 3.1.0)
bourne (= 1.3.0)
cucumber-rails (= 1.3.0)
database_cleaner (= 0.9.1)
- factory_girl_rails (= 4.1.0)
+ factory_girl_rails (= 4.2.1)
pg (= 0.14.1)
rack-contrib (= 1.1.0)
- rails (= 3.2.11)
+ rails (= 3.2.12)
rspec-rails (= 2.12.2)
sass-rails (= 3.2.6)
shoulda-matchers (= 1.4.1)
Please sign in to comment.
Something went wrong with that request. Please try again.