Permalink
Browse files

update rails to 3.2.17

  • Loading branch information...
1 parent 0b34649 commit d445df941c204a4e5d1c8150a6c7d20f94ba91d5 @flyerhzm committed Feb 26, 2014
Showing with 44 additions and 46 deletions.
  1. +2 −2 Gemfile
  2. +42 −44 Gemfile.lock
View
@@ -1,8 +1,8 @@
source 'https://rubygems.org'
-gem 'rails'
+gem 'rails', '3.2.17'
-gem 'mysql2', '~> 0.3.12b6'
+gem 'mysql2'
gem 'rails_best_practices'
gem 'haml'
gem 'slim'
View
@@ -2,37 +2,37 @@ GEM
remote: https://rubygems.org/
specs:
aasm (3.0.16)
- actionmailer (3.2.13)
- actionpack (= 3.2.13)
- mail (~> 2.5.3)
- actionpack (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
+ actionmailer (3.2.17)
+ actionpack (= 3.2.17)
+ mail (~> 2.5.4)
+ 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.13)
- activesupport (= 3.2.13)
+ activemodel (3.2.17)
+ activesupport (= 3.2.17)
builder (~> 3.0.0)
- activerecord (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
+ activerecord (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
- activesupport (3.2.13)
- i18n (= 0.6.1)
+ 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)
addressable (2.3.4)
annotate (2.5.0)
rake
- arel (3.0.2)
+ arel (3.0.3)
awesome_print (1.1.0)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.2.2.0)
@@ -60,7 +60,6 @@ GEM
railties (>= 3.0)
childprocess (0.3.7)
ffi (~> 1.0, >= 1.0.6)
- chronic (0.9.1)
code_analyzer (0.3.1)
sexp_processor
coderay (1.0.8)
@@ -162,18 +161,18 @@ GEM
hashie (2.0.4)
high_voltage (1.2.1)
highline (1.6.15)
- hike (1.2.2)
+ hike (1.2.3)
http_parser.rb (0.5.3)
httpauth (0.2.0)
- i18n (0.6.1)
+ i18n (0.6.9)
journey (1.0.4)
jquery-rails (2.2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (3.0.1)
jquery-rails
railties (>= 3.1.0)
- json (1.7.7)
+ json (1.8.1)
jwt (0.1.8)
multi_json (>= 1.5)
kaminari (0.14.1)
@@ -184,23 +183,22 @@ GEM
libv8 (3.11.8.13)
listen (0.7.2)
lumberjack (1.0.2)
- mail (2.5.3)
- i18n (>= 0.4.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta-tags (1.2.6)
actionpack
metaclass (0.0.1)
method_source (0.8.1)
- mime-types (1.23)
+ mime-types (1.25.1)
mini_magick (3.4)
subexec (~> 0.2.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.7.2)
+ multi_json (1.8.4)
multipart-post (1.2.0)
multiple_mailers (1.1.1)
- mysql2 (0.3.12b6)
+ mysql2 (0.3.15)
nested_form (0.3.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -210,7 +208,7 @@ GEM
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
netrc (0.7.7)
- newrelic_rpm (3.5.8.72)
+ newrelic_rpm (3.7.2.195)
nokogiri (1.5.6)
oa-core (0.3.2)
oauth2 (0.8.1)
@@ -239,12 +237,12 @@ GEM
pickle (0.4.11)
cucumber (>= 0.8)
rake
- polyglot (0.3.3)
+ polyglot (0.3.4)
pry (0.9.11.4)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- puma (2.6.0)
+ puma (2.7.1)
rack (>= 1.1, < 2.0)
quiet_assets (1.0.1)
railties (~> 3.1)
@@ -258,14 +256,14 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.13)
- actionmailer (= 3.2.13)
- actionpack (= 3.2.13)
- activerecord (= 3.2.13)
- activeresource (= 3.2.13)
- activesupport (= 3.2.13)
+ 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.13)
+ railties (= 3.2.17)
rails3-generators (1.0.0)
railties (>= 3.0.0)
rails_admin (0.4.3)
@@ -290,14 +288,14 @@ GEM
erubis
i18n
ruby-progressbar
- railties (3.2.13)
- actionpack (= 3.2.13)
- activesupport (= 3.2.13)
+ railties (3.2.17)
+ actionpack (= 3.2.17)
+ activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.4)
+ rake (10.1.1)
rb-fsevent (0.9.3)
rdoc (3.12.2)
json (~> 1.4)
@@ -368,7 +366,7 @@ GEM
ref
thor (0.18.1)
tilt (1.3.7)
- treetop (1.4.12)
+ treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbo-sprockets-rails3 (0.3.6)
@@ -378,7 +376,7 @@ GEM
actionpack (>= 3.1)
execjs
railties (>= 3.1)
- tzinfo (0.3.37)
+ tzinfo (0.3.38)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -432,7 +430,7 @@ DEPENDENCIES
meta-tags
mocha
multiple_mailers
- mysql2 (~> 0.3.12b6)
+ mysql2
newrelic_rpm
nokogiri
oa-core
@@ -442,7 +440,7 @@ DEPENDENCIES
pickle
puma
quiet_assets
- rails
+ rails (= 3.2.17)
rails3-generators
rails_admin
rails_best_practices

0 comments on commit d445df9

Please sign in to comment.