Skip to content

Commit

Permalink
rails3.2.9へアップデート。
Browse files Browse the repository at this point in the history
  • Loading branch information
sakomoko committed Dec 31, 2012
1 parent fc3cea1 commit 0c4daa7
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 53 deletions.
6 changes: 3 additions & 3 deletions Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '~> 3.1'
gem 'rails', '~> 3.2'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand All @@ -13,8 +13,8 @@ gem 'mongoid-tree', :require => 'mongoid/tree'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', "~> 3.1.0.rc"
gem 'coffee-rails', "~> 3.1.0.rc"
gem 'sass-rails', "~> 3.2"
gem 'coffee-rails', "~> 3.2"
gem 'uglifier'
end

Expand Down
98 changes: 48 additions & 50 deletions Gemfile.lock
@@ -1,36 +1,35 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.8)
actionpack (= 3.1.8)
mail (~> 2.3.3)
actionpack (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
actionmailer (3.2.9)
actionpack (= 3.2.9)
mail (~> 2.4.4)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.8)
activesupport (= 3.1.8)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
arel (~> 2.2.3)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
activesupport (3.1.8)
multi_json (>= 1.0, < 1.3)
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 (2.2.3)
arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.4)
capybara (2.0.1)
Expand All @@ -43,9 +42,9 @@ GEM
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
coderay (1.0.8)
coffee-rails (3.1.1)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
Expand Down Expand Up @@ -87,6 +86,7 @@ GEM
railties (>= 3.1, < 4.1)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
Expand All @@ -96,7 +96,7 @@ GEM
websocket
listen (0.7.0)
lumberjack (1.0.2)
mail (2.3.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand All @@ -114,7 +114,7 @@ GEM
mongoid-tree (1.0.1)
mongoid (>= 3.0, <= 4.0)
moped (1.3.2)
multi_json (1.2.0)
multi_json (1.5.0)
nokogiri (1.5.6)
origin (1.0.11)
orm_adapter (0.4.0)
Expand All @@ -123,30 +123,28 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
rack (1.3.6)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.1.8)
actionmailer (= 3.1.8)
actionpack (= 3.1.8)
activerecord (= 3.1.8)
activeresource (= 3.1.8)
activesupport (= 3.1.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.1.8)
railties (3.1.8)
actionpack (= 3.1.8)
activesupport (= 3.1.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)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rb-fsevent (0.9.2)
rdoc (3.12)
Expand All @@ -168,23 +166,23 @@ GEM
rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
sass (3.2.4)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3.2)
tilt (~> 1.3)
selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
slop (3.3.3)
spork (0.9.2)
sprockets (2.0.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
Expand All @@ -208,7 +206,7 @@ PLATFORMS

DEPENDENCIES
capybara
coffee-rails (~> 3.1.0.rc)
coffee-rails (~> 3.2)
database_cleaner
devise
factory_girl_rails
Expand All @@ -221,10 +219,10 @@ DEPENDENCIES
mongoid (~> 3)
mongoid-rspec
mongoid-tree
rails (~> 3.1)
rails (~> 3.2)
rb-fsevent
rspec-rails
sass-rails (~> 3.1.0.rc)
sass-rails (~> 3.2)
spork (~> 0.9.0.rc)
uglifier
webrat

0 comments on commit 0c4daa7

Please sign in to comment.