Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update Rails

  • Loading branch information...
commit a86f6d4ce32fa637e45d5a7c0a2f28479088564b 1 parent ba0fc41
@nono nono authored
Showing with 31 additions and 35 deletions.
  1. +2 −2 Gemfile
  2. +29 −33 Gemfile.lock
View
4 Gemfile
@@ -1,6 +1,6 @@
source :rubygems
-gem "rails", "~>3.2.5"
+gem "rails", "~>3.2.6"
gem "acts_as_list", "~>0.1.6"
gem "albino", "~>1.3"
@@ -47,7 +47,7 @@ group :development, :test do
end
group :development do
- gem "annotate", :github => "ctran/annotate_models"
+ gem "annotate", "2.5.0.pre1"
gem "autotest-standalone"
gem "capistrano"
gem "capistrano_colors"
View
62 Gemfile.lock
@@ -1,18 +1,12 @@
-GIT
- remote: git://github.com/ctran/annotate_models.git
- revision: 18cd39ad01829deba5aa34634b8540d6675ab978
- specs:
- annotate (2.4.1.beta1)
-
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.5)
- actionpack (= 3.2.5)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
mail (~> 2.4.4)
- actionpack (3.2.5)
- activemodel (= 3.2.5)
- activesupport (= 3.2.5)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
@@ -20,24 +14,26 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
- activemodel (3.2.5)
- activesupport (= 3.2.5)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.5)
- activemodel (= 3.2.5)
- activesupport (= 3.2.5)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.5)
- activemodel (= 3.2.5)
- activesupport (= 3.2.5)
- activesupport (3.2.5)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.6)
addressable (2.2.8)
albino (1.3.3)
posix-spawn (>= 0.3.6)
+ annotate (2.5.0.pre1)
+ rake
arel (3.0.2)
autotest-standalone (4.5.9)
bcrypt-ruby (3.0.1)
@@ -150,7 +146,7 @@ GEM
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.3)
+ nokogiri (1.5.4)
oauth2 (0.7.1)
faraday (~> 0.8)
httpauth (~> 0.1)
@@ -174,17 +170,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.5)
- actionmailer (= 3.2.5)
- actionpack (= 3.2.5)
- activerecord (= 3.2.5)
- activeresource (= 3.2.5)
- activesupport (= 3.2.5)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.5)
- railties (3.2.5)
- actionpack (= 3.2.5)
- activesupport (= 3.2.5)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -276,7 +272,7 @@ PLATFORMS
DEPENDENCIES
acts_as_list (~> 0.1.6)
albino (~> 1.3)
- annotate!
+ annotate (= 2.5.0.pre1)
autotest-standalone
bitfields (~> 0.4)
canable (~> 0.1)
@@ -309,7 +305,7 @@ DEPENDENCIES
oauth2 (~> 0.6)
pry-rails
quiet_assets
- rails (~> 3.2.5)
+ rails (~> 3.2.6)
redcarpet (~> 2.1)
redis (~> 2.2)
redis-activesupport (~> 3.2)
Please sign in to comment.
Something went wrong with that request. Please try again.