Permalink
Browse files

Gem updates

  • Loading branch information...
1 parent 49e0d44 commit 643ba7e36bea5b23ddd833b5b5c4806fc1a16754 @andrew andrew committed Feb 21, 2013
Showing with 25 additions and 25 deletions.
  1. +1 −1 Gemfile
  2. +24 −24 Gemfile.lock
View
@@ -55,7 +55,7 @@ group :development, :test do
end
group :test do
- gem "capybara"
+ gem "capybara", '1.1.4'
gem 'database_cleaner'
gem 'shoulda-matchers'
gem 'webmock', :require => false
View
@@ -28,11 +28,11 @@ GEM
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.3.2)
+ addressable (2.3.3)
arel (3.0.2)
bourne (1.1.2)
mocha (= 0.10.5)
- bugsnag (1.2.12)
+ bugsnag (1.2.14)
httparty (>= 0.6, < 1.0)
multi_json (~> 1.0)
builder (3.0.4)
@@ -43,12 +43,12 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- chai-jquery-rails (0.0.3)
+ chai-jquery-rails (1.1.1)
railties (~> 3.1)
sprockets
childprocess (0.3.8)
ffi (~> 1.0, >= 1.0.11)
- coderay (1.0.8)
+ coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -79,9 +79,9 @@ GEM
multipart-post (~> 1.1)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
- faye-websocket (0.4.6)
+ faye-websocket (0.4.7)
eventmachine (>= 0.12.0)
- ffi (1.3.1)
+ ffi (1.4.0)
foreman (0.61.0)
thor (>= 0.13.6)
guard (1.6.2)
@@ -90,18 +90,19 @@ GEM
pry (>= 0.9.10)
terminal-table (>= 1.4.3)
thor (>= 0.14.6)
- guard-rspec (2.4.0)
+ guard-rspec (2.4.1)
guard (>= 1.1)
rspec (~> 2.11)
guard-spork (1.4.2)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
- haml (3.1.8)
- 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)
@@ -122,7 +123,7 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.8.0)
- konacha (2.4.0)
+ konacha (2.5.0)
actionpack (>= 3.1, < 5)
capybara
colorize
@@ -146,14 +147,14 @@ GEM
mime-types (1.21)
mocha (0.10.5)
metaclass (~> 0.0.1)
- multi_json (1.6.0)
+ multi_json (1.6.1)
multi_xml (0.5.3)
multipart-post (1.1.5)
netrc (0.7.7)
- newrelic_rpm (3.5.6.46)
+ newrelic_rpm (3.5.7.59)
nokogiri (1.5.6)
oauth (0.4.7)
- oauth2 (0.8.0)
+ oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
@@ -166,10 +167,10 @@ GEM
hashie (~> 1.2)
multi_json (~> 1.3)
netrc (~> 0.7.7)
- omniauth (1.1.2)
+ 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-oauth (1.0.1)
@@ -195,9 +196,8 @@ GEM
slop (~> 3.4)
quiet_assets (1.0.1)
railties (~> 3.1)
- rabl (0.7.10)
+ rabl (0.8.0)
activesupport (>= 2.3.14)
- multi_json (~> 1.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
@@ -248,7 +248,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.29.0)
+ selenium-webdriver (2.30.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
@@ -292,21 +292,21 @@ GEM
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)
- twitter-bootstrap-rails (2.2.3)
+ twitter-bootstrap-rails (2.2.4)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.6.0)
+ unicorn (4.6.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- webmock (1.9.0)
+ webmock (1.9.3)
addressable (>= 2.2.7)
- crack (>= 0.1.7)
+ crack (>= 0.3.2)
websocket (1.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -316,7 +316,7 @@ PLATFORMS
DEPENDENCIES
bugsnag
- capybara
+ capybara (= 1.1.4)
chai-jquery-rails
coffee-rails (~> 3.2.1)
dalli

0 comments on commit 643ba7e

Please sign in to comment.