Permalink
Browse files

bundle update all the things

  • Loading branch information...
1 parent 649d818 commit e90d0c86ab5309e43c73ea2e0bc60974fbdc23d0 Andrew Nesbitt committed Mar 30, 2014
Showing with 54 additions and 48 deletions.
  1. +1 −1 Gemfile
  2. +53 −47 Gemfile.lock
View
@@ -24,7 +24,7 @@ gem 'ffi', '1.9.0'
gem 'csv_shaper'
-gem 'sass-rails'
+gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails'
gem 'uglifier'
View
@@ -25,18 +25,18 @@ GEM
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
- addressable (2.3.5)
+ addressable (2.3.6)
anjlab-bootstrap-rails (3.0.3.0)
railties (>= 3.0)
sass (>= 3.2)
arel (4.0.2)
- atomic (1.1.14)
+ atomic (1.1.16)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- brakeman (2.4.0)
+ brakeman (2.4.3)
erubis (~> 2.6)
fastercsv (~> 1.5)
haml (>= 3.0, < 5.0)
@@ -60,10 +60,13 @@ GEM
xpath (~> 2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
+ celluloid-io (0.15.0)
+ celluloid (>= 0.15.0)
+ nio4r (>= 0.5.0)
chai-jquery-rails (1.2.1)
railties (>= 3.1)
sprockets
- childprocess (0.4.0)
+ childprocess (0.5.2)
ffi (~> 1.0, >= 1.0.11)
cliver (0.2.2)
coderay (1.1.0)
@@ -74,7 +77,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
- colorize (0.6.0)
+ colorize (0.7.0)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
@@ -92,18 +95,18 @@ GEM
descendants_tracker (0.0.3)
diff-lcs (1.2.5)
docile (1.1.3)
- dotenv (0.9.0)
+ dotenv (0.10.0)
ejs (1.1.1)
equalizer (0.0.9)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
- factory_girl (4.3.0)
+ factory_girl (4.4.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.3.0)
- factory_girl (~> 4.3.0)
+ factory_girl_rails (4.4.1)
+ factory_girl (~> 4.4.0)
railties (>= 3.0.0)
- faker (1.2.0)
+ faker (1.3.0)
i18n (~> 0.5)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
@@ -113,13 +116,13 @@ GEM
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.4)
- guard (2.4.0)
+ guard (2.6.0)
formatador (>= 0.2.4)
- listen (~> 2.1)
+ listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
- guard-rspec (4.2.5)
+ guard-rspec (4.2.8)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
guard-spork (1.5.1)
@@ -134,12 +137,12 @@ GEM
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
hashie (2.0.5)
- highline (1.6.20)
+ highline (1.6.21)
hike (1.2.3)
http (0.5.0)
http_parser.rb
http_parser.rb (0.5.3)
- httparty (0.12.0)
+ httparty (0.13.0)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.9)
@@ -152,20 +155,21 @@ GEM
kaminari (0.15.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- kgio (2.9.1)
- konacha (3.1.0)
+ kgio (2.9.2)
+ konacha (3.2.1)
actionpack (>= 3.1, < 5)
capybara
colorize
railties (>= 3.1, < 5)
sprockets
launchy (2.4.2)
addressable (~> 2.3)
- listen (2.4.1)
+ listen (2.7.1)
celluloid (>= 0.15.2)
+ celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
- lumberjack (1.0.4)
+ lumberjack (1.0.5)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -174,12 +178,13 @@ GEM
thread_safe (~> 0.1.3)
method_source (0.8.2)
mime-types (1.25.1)
- mini_portile (0.5.2)
+ mini_portile (0.5.3)
minitest (4.7.5)
- multi_json (1.8.4)
+ multi_json (1.9.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
- newrelic_rpm (3.7.2.192)
+ newrelic_rpm (3.7.3.204)
+ nio4r (1.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth (0.4.7)
@@ -189,8 +194,8 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
- octokit (2.7.1)
- sawyer (~> 0.5.2)
+ octokit (3.0.0)
+ sawyer (~> 0.5.3)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
rack (~> 1.0)
@@ -247,8 +252,8 @@ GEM
activesupport (= 4.0.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.12.0)
- rake (10.1.1)
+ raindrops (0.13.0)
+ rake (10.2.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
@@ -258,34 +263,35 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
- rspec-core (2.14.7)
+ rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.14.5)
- rspec-rails (2.14.1)
+ rspec-mocks (2.14.6)
+ rspec-rails (2.14.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
- ruby2ruby (2.0.7)
+ ruby2ruby (2.0.8)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_gntp (0.3.4)
- ruby_parser (3.4.0)
+ ruby_parser (3.4.1)
sexp_processor (~> 4.1)
safe_yaml (1.0.1)
- sass (3.2.14)
- sass-rails (4.0.1)
+ sass (3.2.18)
+ sass-rails (4.0.2)
railties (>= 4.0.0, < 5.0)
- sass (>= 3.1.10)
+ sass (~> 3.2.0)
+ sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0)
- sawyer (0.5.3)
+ sawyer (0.5.4)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
- sexp_processor (4.4.1)
+ sexp_processor (4.4.3)
shoulda-matchers (2.5.0)
activesupport (>= 3.0.0)
simple_form (3.0.0)
@@ -299,12 +305,12 @@ GEM
simplecov-html (0.8.0)
sinon-chai-rails (1.1.0)
railties (>= 3.1)
- sinon-rails (1.7.3)
+ sinon-rails (1.9.0)
railties (>= 3.1)
slim (2.0.2)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
- slop (3.4.7)
+ slop (3.5.0)
spork (0.9.2)
sprockets (2.11.0)
hike (~> 1.2)
@@ -316,20 +322,20 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
temple (0.6.7)
- term-ansicolor (1.2.2)
- tins (~> 0.8)
+ term-ansicolor (1.3.0)
+ tins (~> 1.0)
terminal-table (1.4.5)
- thin (1.6.1)
+ thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
- thor (0.18.1)
+ thor (0.19.1)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
timecop (0.7.0)
timers (1.1.0)
- tins (0.13.2)
+ tins (1.0.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
@@ -343,15 +349,15 @@ GEM
json (~> 1.8)
memoizable (~> 0.2.0)
simple_oauth (~> 0.2.0)
- tzinfo (0.3.38)
- uglifier (2.4.0)
+ tzinfo (0.3.39)
+ uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- webmock (1.17.2)
+ webmock (1.17.4)
addressable (>= 2.2.7)
crack (>= 0.3.2)
websocket-driver (0.3.2)
@@ -401,7 +407,7 @@ DEPENDENCIES
rb-fsevent
rspec-rails
ruby_gntp
- sass-rails
+ sass-rails (~> 4.0.0)
shoulda-matchers
simple_form (= 3.0.0)
simplecov

0 comments on commit e90d0c8

Please sign in to comment.