Upgrade to rails 4.1
This commit is contained in:
wvengen
parent
6188567931
commit
6e990fed4c
23 changed files with 179 additions and 197 deletions
173
Gemfile.lock
173
Gemfile.lock
|
|
@ -1,24 +1,9 @@
|
|||
GIT
|
||||
remote: git://github.com/bcardarella/client_side_validations.git
|
||||
revision: 9461cb92e1dfb64895d590c6d435cdf48fcede45
|
||||
branch: 4-0-beta
|
||||
specs:
|
||||
client_side_validations (3.2.2)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/bennibu/localize_input.git
|
||||
revision: 5eb188d2525a073d09e142cf8b0b04e6ace6e7b0
|
||||
specs:
|
||||
localize_input (0.1.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/saveritemedical/client_side_validations-simple_form.git
|
||||
revision: b97c938be745de1134169026425aa0c990b8b072
|
||||
specs:
|
||||
client_side_validations-simple_form (2.1.0)
|
||||
client_side_validations (~> 3.2.1)
|
||||
simple_form (>= 2.1.0, < 4.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/technoweenie/acts_as_versioned.git
|
||||
revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b
|
||||
|
|
@ -46,33 +31,35 @@ PATH
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.10)
|
||||
actionpack (= 4.0.10)
|
||||
actionmailer (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
actionpack (4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.10)
|
||||
activemodel (= 4.0.10)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.10)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.10)
|
||||
actionview (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.8)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
tzinfo (~> 1.1)
|
||||
acts_as_tree (2.1.0)
|
||||
activerecord (>= 3.0.0)
|
||||
arel (4.0.2)
|
||||
arel (5.0.1.20140414130214)
|
||||
attribute_normalizer (1.2.0)
|
||||
better_errors (2.0.0)
|
||||
coderay (>= 1.0.0)
|
||||
|
|
@ -82,7 +69,7 @@ GEM
|
|||
debug_inspector (>= 0.0.1)
|
||||
bootstrap-datepicker-rails (1.3.0.2)
|
||||
railties (>= 3.0)
|
||||
builder (3.1.4)
|
||||
builder (3.2.2)
|
||||
bullet (4.14.0)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (>= 1.6.0)
|
||||
|
|
@ -110,7 +97,7 @@ GEM
|
|||
ffi (~> 1.0, >= 1.0.11)
|
||||
chronic (0.10.2)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-rails (4.1.0)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.3.0)
|
||||
|
|
@ -119,7 +106,7 @@ GEM
|
|||
coffee-script-source (1.8.0)
|
||||
colorize (0.7.3)
|
||||
commonjs (0.2.7)
|
||||
connection_pool (2.0.0)
|
||||
connection_pool (2.1.0)
|
||||
content_for_in_controllers (0.0.2)
|
||||
coveralls (0.7.1)
|
||||
multi_json (~> 1.3)
|
||||
|
|
@ -147,10 +134,10 @@ GEM
|
|||
activesupport (>= 3.0.4)
|
||||
execjs (2.2.2)
|
||||
expression_parser (0.9.0)
|
||||
factory_girl (4.4.0)
|
||||
factory_girl (4.5.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.4.1)
|
||||
factory_girl (~> 4.4.0)
|
||||
factory_girl_rails (4.5.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
railties (>= 3.0.0)
|
||||
faker (1.4.3)
|
||||
i18n (~> 0.5)
|
||||
|
|
@ -167,13 +154,16 @@ GEM
|
|||
activesupport (>= 3.2, < 5)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n-js (3.0.0.rc6)
|
||||
i18n-js (3.0.0.rc7)
|
||||
i18n (~> 0.6)
|
||||
i18n-spec (0.5.2)
|
||||
i18n-spec (0.6.0)
|
||||
iso
|
||||
inherited_resources (1.5.0)
|
||||
inherited_resources (1.5.1)
|
||||
actionpack (>= 3.2, < 4.2)
|
||||
has_scope (~> 0.6.0.rc)
|
||||
railties (>= 3.2, < 4.2)
|
||||
responders (~> 1.0)
|
||||
interception (0.5)
|
||||
iso (0.2.1)
|
||||
i18n
|
||||
jquery-rails (3.1.2)
|
||||
|
|
@ -183,13 +173,13 @@ GEM
|
|||
kaminari (0.16.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
less (2.5.1)
|
||||
less (2.6.0)
|
||||
commonjs (~> 0.2.7)
|
||||
less-rails (2.5.0)
|
||||
less-rails (2.6.0)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.5.0)
|
||||
less (~> 2.6.0)
|
||||
libv8 (3.16.14.7)
|
||||
mail (2.6.1)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mailcatcher (0.2.4)
|
||||
eventmachine
|
||||
|
|
@ -205,18 +195,19 @@ GEM
|
|||
callsite (~> 0.0, >= 0.0.11)
|
||||
rack-contrib (~> 1.1)
|
||||
railties (>= 3.0.0, < 5.0.0)
|
||||
mime-types (2.4.2)
|
||||
mini_portile (0.6.0)
|
||||
minitest (4.7.5)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.4.3)
|
||||
mini_portile (0.6.1)
|
||||
minitest (5.4.3)
|
||||
mono_logger (1.1.0)
|
||||
multi_json (1.10.1)
|
||||
mysql2 (0.3.16)
|
||||
mysql2 (0.3.17)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.9.1)
|
||||
netrc (0.8.0)
|
||||
nokogiri (1.6.3.1)
|
||||
mini_portile (= 0.6.0)
|
||||
nokogiri (1.6.4.1)
|
||||
mini_portile (~> 0.6.0)
|
||||
pdf-core (0.4.0)
|
||||
polyamorous (1.1.0)
|
||||
activerecord (>= 3.0)
|
||||
|
|
@ -224,25 +215,37 @@ GEM
|
|||
prawn (1.3.0)
|
||||
pdf-core (~> 0.4.0)
|
||||
ttfunk (~> 1.4.0)
|
||||
prawn-table (0.2.0)
|
||||
prawn-table (0.2.1)
|
||||
protected_attributes (1.0.8)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
pry (0.10.1)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
pry-rescue (1.4.1)
|
||||
interception (>= 0.5)
|
||||
pry
|
||||
pry-stack_explorer (0.4.9.1)
|
||||
binding_of_caller (>= 0.7)
|
||||
pry (>= 0.9.11)
|
||||
quiet_assets (1.0.3)
|
||||
railties (>= 3.1, < 5.0)
|
||||
rack (1.5.2)
|
||||
rack-contrib (1.1.0)
|
||||
rack-contrib (1.2.0)
|
||||
rack (>= 0.9.1)
|
||||
rack-protection (1.5.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.10)
|
||||
actionmailer (= 4.0.10)
|
||||
actionpack (= 4.0.10)
|
||||
activerecord (= 4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
rails (4.1.8)
|
||||
actionmailer (= 4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activerecord (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.10)
|
||||
railties (= 4.1.8)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-assets-listjs (0.2.0.beta.4)
|
||||
railties (>= 3.1)
|
||||
|
|
@ -251,13 +254,13 @@ GEM
|
|||
railties (~> 4.0)
|
||||
rails-settings-cached (0.4.1)
|
||||
rails (>= 4.0.0)
|
||||
railties (4.0.10)
|
||||
actionpack (= 4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
railties (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
ransack (1.4.1)
|
||||
ransack (1.5.1)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
|
|
@ -267,7 +270,7 @@ GEM
|
|||
redis-namespace (1.5.1)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
ref (1.0.5)
|
||||
responders (1.1.1)
|
||||
responders (1.1.2)
|
||||
railties (>= 3.2, < 4.2)
|
||||
resque (1.25.2)
|
||||
mono_logger (~> 1.0)
|
||||
|
|
@ -283,7 +286,7 @@ GEM
|
|||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
rspec-collection_matchers (1.0.0)
|
||||
rspec-collection_matchers (1.1.2)
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (2.99.2)
|
||||
rspec-expectations (2.99.2)
|
||||
|
|
@ -300,18 +303,18 @@ GEM
|
|||
rspec-mocks (~> 2.99.0)
|
||||
rspec-rerun (0.2.0)
|
||||
rspec (>= 2.11.0, < 3)
|
||||
ruby-prof (0.15.1)
|
||||
ruby-prof (0.15.2)
|
||||
ruby-units (1.4.5)
|
||||
rubyzip (1.1.6)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.3)
|
||||
sass-rails (4.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.2.0)
|
||||
sprockets (~> 2.8, <= 2.11.0)
|
||||
sass (~> 3.2.2)
|
||||
sprockets (~> 2.8, < 2.12)
|
||||
sprockets-rails (~> 2.0)
|
||||
select2-rails (3.5.9.1)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (2.43.0)
|
||||
selenium-webdriver (2.44.0)
|
||||
childprocess (~> 0.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
|
|
@ -336,7 +339,8 @@ GEM
|
|||
skinny (0.2.3)
|
||||
eventmachine (~> 1.0.0)
|
||||
thin (~> 1.5.0)
|
||||
sprockets (2.11.0)
|
||||
slop (3.6.0)
|
||||
sprockets (2.11.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
|
@ -345,7 +349,7 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sqlite3 (1.3.9)
|
||||
sqlite3 (1.3.10)
|
||||
sqlite3-ruby (1.3.3)
|
||||
sqlite3 (>= 1.3.3)
|
||||
sshkit (1.5.1)
|
||||
|
|
@ -371,7 +375,8 @@ GEM
|
|||
execjs
|
||||
rails (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
tzinfo (0.3.41)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.5.3)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
|
@ -379,7 +384,7 @@ GEM
|
|||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
websocket (1.2.1)
|
||||
whenever (0.9.3)
|
||||
whenever (0.9.4)
|
||||
chronic (>= 0.6.3)
|
||||
wikicloth (0.8.1)
|
||||
builder
|
||||
|
|
@ -404,16 +409,14 @@ DEPENDENCIES
|
|||
capistrano-rails
|
||||
capistrano-rvm
|
||||
capybara
|
||||
client_side_validations!
|
||||
client_side_validations-simple_form!
|
||||
coffee-rails (~> 4.0.0)
|
||||
coffee-rails
|
||||
connection_pool
|
||||
coveralls
|
||||
daemons
|
||||
database_cleaner
|
||||
date_time_attribute
|
||||
exception_notification
|
||||
factory_girl_rails (~> 4.0)
|
||||
factory_girl_rails
|
||||
faker
|
||||
foodsoft_messages!
|
||||
foodsoft_wiki!
|
||||
|
|
@ -431,8 +434,10 @@ DEPENDENCIES
|
|||
prawn
|
||||
prawn-table
|
||||
protected_attributes
|
||||
pry-rescue
|
||||
pry-stack_explorer
|
||||
quiet_assets
|
||||
rails (~> 4.0.0)
|
||||
rails (~> 4.1)
|
||||
rails-assets-listjs (= 0.2.0.beta.4)
|
||||
rails-i18n
|
||||
rails-settings-cached
|
||||
|
|
@ -443,7 +448,7 @@ DEPENDENCIES
|
|||
rspec-rerun
|
||||
ruby-prof
|
||||
ruby-units
|
||||
sass-rails (~> 4.0.0)
|
||||
sass-rails (>= 4.0)
|
||||
select2-rails
|
||||
selenium-webdriver
|
||||
simple-navigation
|
||||
|
|
@ -453,6 +458,6 @@ DEPENDENCIES
|
|||
sqlite3
|
||||
therubyracer
|
||||
thin
|
||||
twitter-bootstrap-rails
|
||||
twitter-bootstrap-rails (~> 2.2.8)
|
||||
uglifier (>= 1.0.3)
|
||||
whenever
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue