diff --git a/Gemfile b/Gemfile index 38c30e3..94e0a96 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,13 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.0' +gem 'rails', '4.2.10' gem 'bcrypt-ruby', '~> 3.0.0' # Use sqlite3 as the database for Active Record gem 'sqlite3' -gem 'mysql2' +gem 'mysql2', "0.4.10" # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' @@ -36,14 +36,14 @@ gem 'haml-rails' gem 'nokogiri' gem 'acts_as_tree' -gem 'formtastic', :git => 'git://github.com/justinfrench/formtastic.git' +gem 'formtastic' #, :git => 'git://github.com/justinfrench/formtastic.git' gem 'formtastic-bootstrap' gem 'kaminari' -gem 'bootstrap3-kaminari-views' +#gem 'bootstrap3-kaminari-views' gem 'carrierwave' @@ -54,8 +54,8 @@ group :doc do gem 'sdoc', require: false end -gem "capistrano", group: :development -gem "rvm-capistrano", group: :development +#gem "capistrano", group: :development +#gem "rvm-capistrano", group: :development gem 'net-ssh', '~>2.7.0' # Use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index b0bbb78..b96fbfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,172 +1,202 @@ -GIT - remote: git://github.com/justinfrench/formtastic.git - revision: ee69d3355bd443d40472147a2d087ed4a5b5af9b - specs: - formtastic (2.3.0.rc3) - actionpack (>= 3.2.13) - 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) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) + rack (~> 1.6) rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - acts_as_tree (2.0.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) + globalid (>= 0.3.0) + activemodel (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) + arel (~> 6.0) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts_as_tree (2.9.1) activerecord (>= 3.0.0) - arel (4.0.2) + arel (6.0.4) bcrypt-ruby (3.0.1) - bootstrap3-kaminari-views (0.0.1) - kaminari - rails (~> 4.0.0) - builder (3.1.4) - capistrano (2.15.5) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + builder (3.2.4) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) + ssrf_filter (~> 1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.7.1) + coffee-script-source (1.12.2) + commonjs (0.2.7) + concurrent-ruby (1.1.8) + crass (1.0.6) erubis (2.7.0) - execjs (2.2.1) - formtastic-bootstrap (3.0.0) - formtastic (>= 2.2) - haml (4.0.5) + execjs (2.8.1) + formtastic (3.1.5) + actionpack (>= 3.2.13) + formtastic-bootstrap (3.1.1) + formtastic (>= 3.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + haml (5.2.1) + temple (>= 0.8.0) tilt - haml-rails (0.5.1) - actionpack (~> 4.0.0) - activesupport (~> 4.0.0) - haml (>= 3.1, < 5.0) - railties (~> 4.0.0) - highline (1.6.21) + haml-rails (1.0.0) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) + railties (>= 4.0.1) hike (1.2.3) - i18n (0.6.11) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.0.2) activesupport (>= 3.0.0) - jquery-rails (3.1.1) - railties (>= 3.0, < 5.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.1) - kaminari (0.16.1) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.11.2) - libv8 (3.16.14.3) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) - mini_portile (0.6.0) - minitest (4.7.5) - multi_json (1.10.1) - mysql2 (0.3.16) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) + actionview + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) + activerecord + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) + kgio (2.11.3) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) + libv8 (3.16.14.19) + loofah (2.9.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0225) + mini_mime (1.1.0) + mini_portile2 (2.4.0) + minitest (5.14.4) + multi_json (1.15.0) + mysql2 (0.4.10) net-ssh (2.7.0) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) - polyglot (0.3.5) - rack (1.5.2) - rack-test (0.6.2) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + rack (1.6.13) + rack-test (0.6.3) 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.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (= 4.2.10) + sprockets-rails + rails-deprecated_sanitizer (1.0.4) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.19.0) - rake (10.3.2) - rdoc (4.1.1) - json (~> 1.4) - ref (1.0.5) - rmagick (2.13.4) - rvm-capistrano (1.5.3) - capistrano (~> 2.15.4) + raindrops (0.19.1) + rake (13.0.3) + rdoc (6.3.1) + ref (2.0.0) + rmagick (4.2.2) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) sass (3.2.19) - sass-rails (4.0.3) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) - sdoc (0.4.0) - json (~> 1.8) - rdoc (~> 4.0, < 5.0) - sprockets (2.11.0) + sdoc (2.1.0) + rdoc (>= 5.0) + sexp_processor (4.15.2) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.9) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) + sprockets (>= 2.8, < 4.0) + sqlite3 (1.4.2) + ssrf_filter (1.0.7) + temple (0.8.2) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) - thread_safe (0.3.4) + thor (1.1.0) + thread_safe (0.3.6) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - turbolinks (2.2.2) - coffee-rails - twitter-bootstrap-rails (2.2.8) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + twitter-bootstrap-rails (3.2.2) actionpack (>= 3.1) - execjs - rails (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) railties (>= 3.1) - tzinfo (0.3.40) - uglifier (2.5.3) - execjs (>= 0.3.0) - json (>= 1.8.0) - unicorn (4.6.3) + tzinfo (1.2.9) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + unicorn (6.0.0) kgio (~> 2.6) - rack raindrops (~> 0.7) PLATFORMS @@ -175,22 +205,19 @@ PLATFORMS DEPENDENCIES acts_as_tree bcrypt-ruby (~> 3.0.0) - bootstrap3-kaminari-views - capistrano carrierwave coffee-rails (~> 4.0.0) - formtastic! + formtastic formtastic-bootstrap haml-rails jbuilder (~> 1.0.1) jquery-rails kaminari - mysql2 + mysql2 (= 0.4.10) net-ssh (~> 2.7.0) nokogiri - rails (= 4.0.0) + rails (= 4.2.10) rmagick - rvm-capistrano sass-rails (~> 4.0.3) sdoc sqlite3 @@ -201,4 +228,4 @@ DEPENDENCIES unicorn BUNDLED WITH - 1.14.3 + 1.17.3 diff --git a/Gemfile.lock.new b/Gemfile.lock.new new file mode 100644 index 0000000..e91e052 --- /dev/null +++ b/Gemfile.lock.new @@ -0,0 +1,248 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) + globalid (>= 0.3.0) + activemodel (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) + arel (~> 6.0) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts_as_tree (2.9.1) + activerecord (>= 3.0.0) + arel (6.0.4) + bcrypt-ruby (3.0.1) + builder (3.2.4) + capistrano (2.15.9) + highline + net-scp (>= 1.0.0) + net-sftp (>= 2.0.0) + net-ssh (>= 2.0.14) + net-ssh-gateway (>= 1.1.0) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + ssrf_filter (~> 1.0) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + commonjs (0.2.7) + concurrent-ruby (1.1.8) + crass (1.0.6) + erubis (2.7.0) + execjs (2.8.1) + formtastic (3.1.5) + actionpack (>= 3.2.13) + formtastic-bootstrap (3.1.1) + formtastic (>= 3.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + haml (5.2.1) + temple (>= 0.8.0) + tilt + haml-rails (1.0.0) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) + railties (>= 4.0.1) + highline (2.0.3) + hike (1.2.3) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jbuilder (1.0.2) + activesupport (>= 3.0.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) + actionview + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) + activerecord + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) + kgio (2.11.3) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) + libv8 (3.16.14.19) + loofah (2.9.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0225) + mini_mime (1.1.0) + mini_portile2 (2.4.0) + minitest (5.14.4) + multi_json (1.15.0) + mysql2 (0.4.10) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.7.0) + net-ssh-gateway (1.3.0) + net-ssh (>= 2.6.5) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + rack (1.6.13) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.10) + sprockets-rails + rails-deprecated_sanitizer (1.0.4) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + raindrops (0.19.1) + rake (13.0.3) + rdoc (6.3.1) + ref (2.0.0) + rmagick (4.2.2) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) + rvm-capistrano (1.5.6) + capistrano (~> 2.15.4) + sass (3.2.19) + sass-rails (4.0.5) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) + sprockets-rails (~> 2.0) + sdoc (2.1.0) + rdoc (>= 5.0) + sexp_processor (4.15.2) + sprockets (2.12.5) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.3.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) + sqlite3 (1.4.2) + ssrf_filter (1.0.7) + temple (0.8.2) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref + thor (1.1.0) + thread_safe (0.3.6) + tilt (1.4.1) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + twitter-bootstrap-rails (3.2.2) + actionpack (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) + railties (>= 3.1) + tzinfo (1.2.9) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + unicorn (6.0.0) + kgio (~> 2.6) + raindrops (~> 0.7) + +PLATFORMS + ruby + +DEPENDENCIES + acts_as_tree + bcrypt-ruby (~> 3.0.0) + capistrano + carrierwave + coffee-rails (~> 4.0.0) + formtastic + formtastic-bootstrap + haml-rails + jbuilder (~> 1.0.1) + jquery-rails + kaminari + mysql2 (= 0.4.10) + net-ssh (~> 2.7.0) + nokogiri + rails (= 4.2.10) + rmagick + rvm-capistrano + sass-rails (~> 4.0.3) + sdoc + sqlite3 + therubyracer + turbolinks + twitter-bootstrap-rails + uglifier (>= 1.3.0) + unicorn + +BUNDLED WITH + 1.17.3 diff --git a/app/models/article.rb b/app/models/article.rb index 903f40b..d4f73f8 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -5,7 +5,7 @@ class Article < ActiveRecord::Base has_one :block, :as => :blockable has_many :comments, :as => :commentable belongs_to :category - has_many :enabled_comments,:conditions => {:enabled => true}, :source => :comments, :as => :commentable + has_many :enabled_comments, :source => :comments, :as => :commentable #,:conditions => {:enabled => true} after_create :after_creation before_validation do @@ -30,7 +30,7 @@ class Article < ActiveRecord::Base end - scope :recents, where("enabled = ?",true ).order("published_at DESC") + scope :recents, lambda { where("enabled = ?",true ).order("published_at DESC") } scope :between, lambda { |start, stop| after(start).before(stop) diff --git a/app/models/block.rb b/app/models/block.rb index 19108ec..82285f6 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -19,7 +19,7 @@ class Block < ActiveRecord::Base belongs_to :blockable, :polymorphic => true - has_many :portlets, :order => :position, :dependent => :destroy + has_many :portlets, :dependent => :destroy #, :order => :position accepts_nested_attributes_for :portlets diff --git a/app/models/gallery_content.rb b/app/models/gallery_content.rb index 480a977..8bddd23 100644 --- a/app/models/gallery_content.rb +++ b/app/models/gallery_content.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- class GalleryContent < ActiveRecord::Base - has_many :gallery_images, :order => :position + has_many :gallery_images #, :order => :position has_one :portlet, :as => :content, :dependent => :destroy diff --git a/app/models/portfolio.rb b/app/models/portfolio.rb index c09b258..5df0e0d 100644 --- a/app/models/portfolio.rb +++ b/app/models/portfolio.rb @@ -1,6 +1,6 @@ class Portfolio < ActiveRecord::Base belongs_to :artwork - has_many :artworks, :order => "position", :dependent => :destroy + has_many :artworks, :dependent => :destroy #, :order => "position" before_validation do self.slug = self.title.to_slug diff --git a/app/models/portlet.rb b/app/models/portlet.rb index 60523f6..f9f72b3 100644 --- a/app/models/portlet.rb +++ b/app/models/portlet.rb @@ -4,6 +4,8 @@ class Portlet < ActiveRecord::Base belongs_to :content, :polymorphic => true accepts_nested_attributes_for :content + default_scope { order(position: :asc) } + attr_accessor :skip_before_update diff --git a/app/models/table_content.rb b/app/models/table_content.rb index 439ea9e..fd470a8 100644 --- a/app/models/table_content.rb +++ b/app/models/table_content.rb @@ -1,7 +1,7 @@ # -*- encoding : utf-8 -*- class TableContent < ActiveRecord::Base has_one :portlet, :as => :content, :dependent => :destroy - has_many :table_rows, :include => :cel_tables, :order => :position + has_many :table_rows #, :include => :cel_tables, :order => :position has_many :cel_tables, :through => :table_rows STYLES = [["avec bordures",1],["sans bordures",2]] diff --git a/app/models/table_row.rb b/app/models/table_row.rb index 5f3dd5c..99bd17b 100644 --- a/app/models/table_row.rb +++ b/app/models/table_row.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- class TableRow < ActiveRecord::Base - has_many :cel_tables, :order => :position + has_many :cel_tables #, :order => :position belongs_to :table_content attr_accessor :skip_before_update diff --git a/config/env_init b/config/env_init index b862255..88e99fa 100644 --- a/config/env_init +++ b/config/env_init @@ -1,4 +1,4 @@ -APP_RUBY=2.0.0-p648 +APP_RUBY=2.6.0 ENV=production APP_ROOT=/srv/www/web/ecole_eft_app/current/ GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY