Upgrade to Rails 4.0.1

openid
Marcin Kulik 11 years ago
parent c785e1a1ff
commit 7454325dac

@ -1,7 +1,10 @@
source 'https://rubygems.org'
gem 'rails', '~> 4.0.0'
gem 'protected_attributes', '~> 1.0.3'
gem 'rails', '~> 4.0.1'
gem 'sass-rails', '~> 4.0.1'
gem 'coffee-rails', '~> 4.0.1'
gem 'protected_attributes', '~> 1.0.5'
gem 'jquery-rails', '~> 2.2.0'
gem 'pg', '~> 0.14.1'
gem 'carrierwave', '~> 0.8.0'
@ -20,8 +23,6 @@ gem 'open4', '~> 1.3.0'
gem 'redcarpet', '~> 2.2.2'
gem 'slim', '~> 2.0.0'
gem 'dotenv-rails', '~> 0.8'
gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'uglifier', '>= 2.1.2'
gem 'sinatra', '~> 1.4.3', :require => false
gem 'active_model_serializers', '~> 0.8.1'

@ -10,27 +10,27 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
actionmailer (4.0.1)
actionpack (= 4.0.1)
mail (~> 2.5.4)
actionpack (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
active_model_serializers (0.8.1)
activemodel (>= 3.0)
activemodel (4.0.0)
activesupport (= 4.0.0)
activemodel (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord (4.0.1)
activemodel (= 4.0.1)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
activesupport (= 4.0.1)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
activesupport (4.0.1)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
@ -39,7 +39,7 @@ GEM
airbrake (3.1.14)
builder
json
arel (4.0.0)
arel (4.0.1)
atomic (1.1.14)
builder (3.1.4)
cane (2.5.2)
@ -64,9 +64,9 @@ GEM
celluloid (0.14.1)
timers (>= 1.0.0)
coderay (1.0.9)
coffee-rails (4.0.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 5.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@ -86,8 +86,7 @@ GEM
erubis (2.7.0)
eventmachine (1.0.3)
excon (0.25.3)
execjs (1.4.0)
multi_json (~> 1.0)
execjs (2.0.2)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
@ -151,7 +150,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.23)
mime-types (1.25.1)
minitest (4.7.5)
multi_json (1.8.2)
multipart-post (1.2.0)
@ -193,8 +192,8 @@ GEM
faye-websocket (>= 0.4.4, < 0.5.0)
http_parser.rb (~> 0.5.3)
polyglot (0.3.3)
protected_attributes (1.0.3)
activemodel (>= 4.0.0, < 5.0)
protected_attributes (1.0.5)
activemodel (>= 4.0.1, < 5.0)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
@ -208,17 +207,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
rails (4.0.1)
actionmailer (= 4.0.1)
actionpack (= 4.0.1)
activerecord (= 4.0.1)
activesupport (= 4.0.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
railties (= 4.0.1)
sprockets-rails (~> 2.0.0)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
railties (4.0.1)
actionpack (= 4.0.1)
activesupport (= 4.0.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.11.0)
@ -249,9 +248,9 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby-hmac (0.4.0)
sass (3.2.10)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (3.2.12)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
shoulda-matchers (2.4.0)
@ -277,12 +276,12 @@ GEM
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.4.6)
sprockets (2.10.0)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
@ -296,7 +295,7 @@ GEM
atomic
tilt (1.4.1)
timers (1.1.0)
treetop (1.4.14)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
@ -324,7 +323,7 @@ DEPENDENCIES
capistrano-ext (~> 1.2)
capybara (~> 2.1.0)
carrierwave (~> 0.8.0)
coffee-rails (~> 4.0.0)
coffee-rails (~> 4.0.1)
dalli (~> 2.6.2)
database_cleaner (~> 1.0.1)
dotenv-rails (~> 0.8)
@ -344,15 +343,15 @@ DEPENDENCIES
open4 (~> 1.3.0)
pg (~> 0.14.1)
poltergeist (~> 1.3.0)
protected_attributes (~> 1.0.3)
protected_attributes (~> 1.0.5)
pry-rails (~> 0.3.0)
quiet_assets (~> 1.0.1)
rails (~> 4.0.0)
rails (~> 4.0.1)
rake (~> 10.0.4)
rb-inotify (~> 0.9.0)
redcarpet (~> 2.2.2)
rspec-rails (~> 2.14)
sass-rails (~> 4.0.0)
sass-rails (~> 4.0.1)
shoulda-matchers (~> 2.4.0)
sidekiq (~> 2.13)
simple_form (~> 3.0.0)

Loading…
Cancel
Save