Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rails 3.2.11

  • Loading branch information...
commit ef6fd9c0c7adcd01fcc6df331615e3d6ce780acc 1 parent 5388695
@penso authored
Showing with 55 additions and 48 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1  Gemfile
  3. +49 −47 Gemfile.lock
View
5 ChangeLog
@@ -1,3 +1,8 @@
+2013-01-08 Fabien Penso <fabien.penso@conovae.com>
+
+ * specs fixing, lots of bugfix
+ * 8h
+
2013-01-06 Fabien Penso <fabien.penso@conovae.com>
* Flexslider integration
View
2  Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.9'
+gem 'rails'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
96 Gemfile.lock
@@ -8,13 +8,13 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- aasm (3.0.14)
- actionmailer (3.2.9)
- actionpack (= 3.2.9)
+ aasm (3.0.15)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -24,23 +24,23 @@ GEM
sprockets (~> 2.2.1)
active_scaffold (3.2.17)
rails (>= 3.1.3)
- activemodel (3.2.9)
- activesupport (= 3.2.9)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
- activesupport (3.2.9)
+ activeresource (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
- acts_as_list (0.1.8)
+ acts_as_list (0.1.9)
addressable (2.3.2)
archive-tar-minitar (0.5.2)
arel (3.0.2)
@@ -54,14 +54,14 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
- 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)
- carrierwave (0.7.1)
+ carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
childprocess (0.3.6)
@@ -76,9 +76,9 @@ GEM
colored (1.2)
columnize (0.3.6)
commonjs (0.2.6)
- crack (0.3.1)
+ crack (0.3.2)
database_cleaner (0.9.1)
- devise (2.1.2)
+ devise (2.2.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -94,7 +94,7 @@ GEM
railties (>= 3.0.0)
faker (1.1.2)
i18n (~> 0.5)
- ffi (1.2.0)
+ ffi (1.3.0)
flash_cookie_session (1.1.3)
rails (~> 3.0)
formtastic (2.2.1)
@@ -111,14 +111,14 @@ GEM
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.5)
+ json (1.7.6)
kgio (2.7.4)
less (2.2.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
- libv8 (3.3.10.4)
+ libv8 (3.11.8.13)
libwebsocket (0.1.7.1)
addressable
websocket
@@ -132,7 +132,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- multi_json (1.3.7)
+ multi_json (1.5.0)
mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -144,43 +144,44 @@ GEM
nokogiri (1.5.6)
orm_adapter (0.4.0)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.3)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.9)
- actionmailer (= 3.2.9)
- actionpack (= 3.2.9)
- activerecord (= 3.2.9)
- activeresource (= 3.2.9)
- activesupport (= 3.2.9)
+ rails (3.2.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.9)
- railties (3.2.9)
- actionpack (= 3.2.9)
- activesupport (= 3.2.9)
+ railties (= 3.2.11)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rainbow (1.1.4)
raindrops (0.10.0)
- rake (10.0.2)
+ rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
+ ref (1.0.2)
rmagick (2.13.1)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
- rspec-core (2.12.0)
- 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.1)
+ rspec-rails (2.12.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -200,7 +201,7 @@ GEM
rubyzip (0.9.9)
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
- sass (3.2.3)
+ sass (3.2.5)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -210,7 +211,7 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sprockets (2.2.1)
+ sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -219,14 +220,15 @@ GEM
tabulous (1.3.0)
colored (~> 1.2.0)
rails (~> 3.0)
- therubyracer (0.10.2)
- libv8 (~> 3.3.10)
+ therubyracer (0.11.1)
+ libv8 (~> 3.11.8.7)
+ ref
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.1.6)
+ twitter-bootstrap-rails (2.2.0)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
@@ -234,7 +236,7 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.4.0)
+ unicorn (4.5.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -277,7 +279,7 @@ DEPENDENCIES
less-rails
lograge
mysql2
- rails (= 3.2.9)
+ rails
rainbow
rmagick
rspec
Please sign in to comment.
Something went wrong with that request. Please try again.