Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

version bumped rails to 3.2.9

  • Loading branch information...
commit d8fcd7ec9a26d1ab9930af8668acb7a86290a394 1 parent 96ccf95
@veganstraightedge veganstraightedge authored
Showing with 92 additions and 77 deletions.
  1. +3 −3 Gemfile
  2. +89 −74 Gemfile.lock
View
6 Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "rails", "~> 3.2.8"
+gem "rails", "~> 3.2.9"
gem "bcrypt-ruby", "~> 3.0.1"
gem "jquery-rails"
gem "sqlite3"
@@ -16,7 +16,7 @@ end
group :assets do
gem "sass-rails", "~> 3.2.5"
- gem "uglifier", "~> 1.2.7"
+ gem "uglifier", "~> 1.3.0"
end
gem "jquery-rails"
@@ -33,6 +33,6 @@ group :test, :development do
gem "launchy"
gem "nyan-cat-formatter"
gem "simplecov", :require => false
- gem "spork", "> 0.9.0.rc"
+ gem "spork", "~> 0.9.2"
gem "vcr"
end
View
163 Gemfile.lock
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.8)
- activesupport (= 3.2.8)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
- activesupport (3.2.8)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- builder (3.0.0)
- capybara (1.1.2)
+ builder (3.0.4)
+ capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -42,14 +42,15 @@ GEM
capybara-mechanize (0.3.0)
capybara (~> 1.1)
mechanize (~> 2.3)
- childprocess (0.3.5)
+ childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
- database_cleaner (0.8.0)
+ coderay (1.0.8)
+ database_cleaner (0.9.1)
diff-lcs (1.1.3)
- domain_name (0.5.3)
+ domain_name (0.5.6)
unf (~> 0.0.3)
erubis (2.7.0)
- excon (0.16.1)
+ excon (0.16.10)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (3.4.2)
@@ -58,45 +59,48 @@ GEM
factory_girl (~> 3.4.0)
railties (>= 3.0.0)
fakeweb (1.3.0)
- ffi (1.1.5)
+ ffi (1.2.0)
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
growl (1.0.3)
- guard (1.3.2)
+ guard (1.5.4)
listen (>= 0.4.2)
+ lumberjack (>= 1.0.2)
+ pry (>= 0.9.10)
thor (>= 0.14.6)
- guard-rspec (1.2.1)
+ guard-rspec (2.3.1)
guard (>= 1.1)
- guard-spork (1.1.0)
+ rspec (~> 2.11)
+ guard-spork (1.4.0)
+ childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
gx (1.3.3)
grit (~> 2.4)
- heroku (2.30.3)
- heroku-api (~> 0.3.4)
+ heroku (2.33.3)
+ heroku-api (~> 0.3.7)
launchy (>= 0.3.2)
netrc (~> 0.7.7)
rest-client (~> 1.6.1)
rubyzip
- heroku-api (0.3.4)
- excon (~> 0.16.1)
+ heroku-api (0.3.7)
+ excon (~> 0.16.10)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.1.1)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
json (1.7.5)
launchy (2.1.2)
addressable (~> 2.3)
- libwebsocket (0.1.5)
+ libwebsocket (0.1.7.1)
addressable
- listen (0.4.7)
- rb-fchange (~> 0.0.5)
- rb-fsevent (~> 0.9.1)
- rb-inotify (~> 0.8.8)
+ websocket
+ listen (0.6.0)
+ lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -109,71 +113,81 @@ GEM
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (~> 0.0, >= 0.0.9)
+ method_source (0.8.1)
mime-types (1.19)
- multi_json (1.3.6)
+ multi_json (1.4.0)
net-http-digest_auth (1.2.1)
- net-http-persistent (2.7)
+ net-http-persistent (2.8)
netrc (0.7.7)
nokogiri (1.5.5)
ntlm-http (0.1.1)
- nyan-cat-formatter (0.0.8.1)
+ nyan-cat-formatter (0.2.0)
polyglot (0.3.3)
posix-spawn (0.3.6)
- puma (1.6.1)
+ pry (0.9.10)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.3.1)
+ puma (1.6.3)
rack (~> 1.2)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.8)
- actionmailer (= 3.2.8)
- actionpack (= 3.2.8)
- activerecord (= 3.2.8)
- activeresource (= 3.2.8)
- activesupport (= 3.2.8)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.8)
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
- rb-fchange (0.0.5)
- ffi
- rb-fsevent (0.9.1)
- rb-inotify (0.8.8)
- ffi (>= 0.5.0)
+ rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.1)
+ rspec-expectations (2.12.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.12.0)
rubyzip (0.9.9)
- sass (3.2.1)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.25.0)
+ selenium-webdriver (2.27.1)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
sequel (3.20.0)
- simplecov (0.6.4)
+ simplecov (0.7.1)
multi_json (~> 1.0)
- simplecov-html (~> 0.5.3)
- simplecov-html (0.5.3)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
sinatra (1.0)
rack (>= 1.0)
- spork (1.0.0rc3)
- sprockets (2.1.3)
+ slop (3.3.3)
+ spork (0.9.2)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
@@ -184,18 +198,19 @@ GEM
sinatra (~> 1.0.0)
thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- uglifier (1.2.7)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.0, >= 1.0.2)
unf (0.0.5)
unf_ext
unf_ext (0.0.5)
- vcr (2.2.4)
+ vcr (2.3.0)
webrobots (0.0.13)
+ websocket (1.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -219,11 +234,11 @@ DEPENDENCIES
launchy
nyan-cat-formatter
puma
- rails (~> 3.2.8)
+ rails (~> 3.2.9)
sass-rails (~> 3.2.5)
simplecov
- spork (> 0.9.0.rc)
+ spork (~> 0.9.2)
sqlite3
taps
- uglifier (~> 1.2.7)
+ uglifier (~> 1.3.0)
vcr
Please sign in to comment.
Something went wrong with that request. Please try again.