Permalink
Browse files

update rails to 3.2.17

  • Loading branch information...
1 parent 658e223 commit 782eef0664700e85d2cdc73a809808966afed86c @alexander-machehin alexander-machehin committed Feb 18, 2014
Showing with 27 additions and 27 deletions.
  1. +1 −1 Gemfile
  2. +26 −26 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.16' #, git: 'git://github.com/rails/rails.git'
+gem 'rails', '3.2.17'
gem 'redhillonrails_core', git: 'git://github.com/rosa-abf/redhillonrails_core.git', branch: 'rails31' # '~> 2.0.0.pre' # deprecated
gem 'pg', '~> 0.14.0'
View
@@ -35,31 +35,31 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (3.2.16)
- actionpack (= 3.2.16)
+ actionmailer (3.2.17)
+ actionpack (= 3.2.17)
mail (~> 2.5.4)
- actionpack (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ actionpack (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.16)
- activesupport (= 3.2.16)
+ activemodel (3.2.17)
+ activesupport (= 3.2.17)
builder (~> 3.0.0)
- activerecord (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ activerecord (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
- activesupport (3.2.16)
+ activeresource (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
+ activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
airbrake (3.1.15)
@@ -272,7 +272,7 @@ GEM
cocaine (~> 0.5.3)
mime-types
pg (0.14.1)
- polyglot (0.3.3)
+ polyglot (0.3.4)
posix-spawn (0.3.8)
puma (2.7.1)
rack (>= 1.1, < 2.0)
@@ -291,21 +291,21 @@ GEM
rack (>= 1.0)
rack-throttle (0.3.0)
rack (>= 1.0.0)
- rails (3.2.16)
- actionmailer (= 3.2.16)
- actionpack (= 3.2.16)
- activerecord (= 3.2.16)
- activeresource (= 3.2.16)
- activesupport (= 3.2.16)
+ rails (3.2.17)
+ actionmailer (= 3.2.17)
+ actionpack (= 3.2.17)
+ activerecord (= 3.2.17)
+ activeresource (= 3.2.17)
+ activesupport (= 3.2.17)
bundler (~> 1.0)
- railties (= 3.2.16)
+ railties (= 3.2.17)
rails3-generators (1.0.0)
railties (>= 3.0.0)
rails3-jquery-autocomplete (1.0.12)
rails (>= 3.0)
- railties (3.2.16)
- actionpack (= 3.2.16)
- activesupport (= 3.2.16)
+ railties (3.2.17)
+ actionpack (= 3.2.17)
+ activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -511,7 +511,7 @@ DEPENDENCIES
pg (~> 0.14.0)
puma
rack-throttle
- rails (= 3.2.16)
+ rails (= 3.2.17)
rails3-generators
rails3-jquery-autocomplete (~> 1.0.7)
rake

0 comments on commit 782eef0

Please sign in to comment.