gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to rails 4.1

Browse source
This commit is contained in:
Henne Vogelsang 2014-04-23 17:23:21 +02:00
parent 2e9b92c3af
commit eacdd9cfd6
2 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
# Use rails as framework # Use rails as framework
gem 'rails', '4.0.0' gem 'rails', '~> 4.1'
# Use mysql as the database for Active Record # Use mysql as the database for Active Record
gem 'mysql2' gem 'mysql2'

91
Gemfile.lock
View file

@ -1,38 +1,40 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.0.0) actionmailer (4.1.0)
actionpack (= 4.0.0) actionpack (= 4.1.0)
mail (~> 2.5.3) actionview (= 4.1.0)
actionpack (4.0.0) mail (~> 2.5.4)
activesupport (= 4.0.0) actionpack (4.1.0)
builder (~> 3.1.0) actionview (= 4.1.0)
erubis (~> 2.7.0) activesupport (= 4.1.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
erubis (~> 2.7.0)
active_model_serializers (0.8.1) active_model_serializers (0.8.1)
activemodel (>= 3.0) activemodel (>= 3.0)
activemodel (4.0.0) activemodel (4.1.0)
activesupport (= 4.0.0) activesupport (= 4.1.0)
builder (~> 3.1.0) builder (~> 3.1)
activerecord (4.0.0) activerecord (4.1.0)
activemodel (= 4.0.0) activemodel (= 4.1.0)
activerecord-deprecated_finders (~> 1.0.2) activesupport (= 4.1.0)
activesupport (= 4.0.0) arel (~> 5.0.0)
arel (~> 4.0.0) activesupport (4.1.0)
activerecord-deprecated_finders (1.0.3) i18n (~> 0.6, >= 0.6.9)
activesupport (4.0.0) json (~> 1.7, >= 1.7.7)
i18n (~> 0.6, >= 0.6.4) minitest (~> 5.1)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 0.3.37) tzinfo (~> 1.1)
acts_as_commentable_with_threading (1.2.0) acts_as_commentable_with_threading (1.2.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
awesome_nested_set (>= 2.0) awesome_nested_set (>= 2.0)
addressable (2.3.6) addressable (2.3.6)
arel (4.0.2) arel (5.0.1.20140414130214)
awesome_nested_set (2.1.6) awesome_nested_set (2.1.6)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
axlsx (2.0.1) axlsx (2.0.1)
@ -45,7 +47,7 @@ GEM
bcrypt (3.1.7) bcrypt (3.1.7)
bootstrap-sass (3.1.1.1) bootstrap-sass (3.1.1.1)
sass (~> 3.2) sass (~> 3.2)
builder (3.1.4) builder (3.2.2)
cancan (1.6.10) cancan (1.6.10)
capybara (2.2.1) capybara (2.2.1)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -95,11 +97,11 @@ GEM
gravtastic (3.2.6) gravtastic (3.2.6)
haml (4.0.5) haml (4.0.5)
tilt tilt
haml-rails (0.5.1) haml-rails (0.5.3)
actionpack (~> 4.0.0) actionpack (>= 4.0.1)
activesupport (~> 4.0.0) activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0) haml (>= 3.1, < 5.0)
railties (~> 4.0.0) railties (>= 4.0.1)
hike (1.2.3) hike (1.2.3)
hoptoad_notifier (2.4.11) hoptoad_notifier (2.4.11)
activesupport activesupport
@ -127,7 +129,7 @@ GEM
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.5.3) mini_portile (0.5.3)
minitest (4.7.5) minitest (5.3.3)
multi_json (1.9.2) multi_json (1.9.2)
mysql2 (0.3.15) mysql2 (0.3.15)
nokogiri (1.6.1) nokogiri (1.6.1)
@ -149,24 +151,26 @@ GEM
prawn_rails (0.0.11) prawn_rails (0.0.11)
prawn (>= 0.11.1) prawn (>= 0.11.1)
railties (>= 3.0.0) railties (>= 3.0.0)
protected_attributes (1.0.3) protected_attributes (1.0.7)
activemodel (>= 4.0.0, < 5.0) activemodel (>= 4.0.1, < 5.0)
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.0) rails (4.1.0)
actionmailer (= 4.0.0) actionmailer (= 4.1.0)
actionpack (= 4.0.0) actionpack (= 4.1.0)
activerecord (= 4.0.0) actionview (= 4.1.0)
activesupport (= 4.0.0) activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0) railties (= 4.1.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0)
rails-observers (0.1.2) rails-observers (0.1.2)
activemodel (~> 4.0) activemodel (~> 4.0)
railties (4.0.0) railties (4.1.0)
actionpack (= 4.0.0) actionpack (= 4.1.0)
activesupport (= 4.0.0) activesupport (= 4.1.0)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.1) rake (10.3.1)
@ -216,7 +220,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1) sprockets-rails (2.1.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -234,7 +238,8 @@ GEM
ttfunk (1.1.1) ttfunk (1.1.1)
turbolinks (2.2.2) turbolinks (2.2.2)
coffee-rails coffee-rails
tzinfo (0.3.39) tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
@ -273,7 +278,7 @@ DEPENDENCIES
prawn prawn
prawn_rails prawn_rails
protected_attributes protected_attributes
rails (= 4.0.0) rails (~> 4.1)
rails-observers rails-observers
rdoc-generator-fivefish rdoc-generator-fivefish
rspec-rails (~> 3.0.0.beta) rspec-rails (~> 3.0.0.beta)