This commit is contained in:
Nicolas Bally 2021-05-15 09:36:01 +02:00
parent f6a786bad7
commit ebec6482b8
4 changed files with 183 additions and 165 deletions

15
Gemfile
View File

@ -1,12 +1,12 @@
source 'https://rubygems.org' source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.0.13' gem 'rails', '4.2.10'
gem 'bcrypt-ruby', '3.1.2' gem 'bcrypt-ruby', '3.1.2'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
gem 'mysql2', '~> 0.3.18' gem 'mysql2', "0.4.10"
gem 'sass-rails' gem 'sass-rails'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
@ -47,14 +47,7 @@ group :doc do
gem 'sdoc', require: false gem 'sdoc', require: false
end end
gem "capistrano", group: :development gem 'unicorn' #, "4.6.3"
gem "rvm-capistrano", group: :development, :require => false
gem 'net-ssh', '~>2.7.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
# Use unicorn as the app server
gem 'unicorn', "4.6.3"
gem 'kaminari-bootstrap' gem 'kaminari-bootstrap'
@ -72,7 +65,7 @@ gem 'carrierwave', "0.9.0"
gem "geocoder" gem "geocoder"
#markdown #markdown
gem 'pygments.rb' #gem 'pygments.rb'
gem 'redcarpet' gem 'redcarpet'
gem "non-stupid-digest-assets" gem "non-stupid-digest-assets"
gem "twitter-bootstrap-rails" gem "twitter-bootstrap-rails"

View File

@ -1,44 +1,48 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.0.13) actionmailer (4.2.10)
actionpack (= 4.0.13) actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.0.13) actionpack (4.2.10)
builder (~> 3.1.0) actionview (= 4.2.10)
erubis (~> 2.7.0) activesupport (= 4.2.10)
rack (~> 1.5.2) rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
activemodel (4.0.13) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.0.13) rails-html-sanitizer (~> 1.0, >= 1.0.2)
builder (~> 3.1.0) actionview (4.2.10)
activerecord (4.0.13) activesupport (= 4.2.10)
activemodel (= 4.0.13) builder (~> 3.1)
activerecord-deprecated_finders (~> 1.0.2) erubis (~> 2.7.0)
activesupport (= 4.0.13) rails-dom-testing (~> 1.0, >= 1.0.5)
arel (~> 4.0.0) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activerecord-deprecated_finders (1.0.4) activejob (4.2.10)
activesupport (4.0.13) activesupport (= 4.2.10)
i18n (~> 0.6, >= 0.6.9) globalid (>= 0.3.0)
minitest (~> 4.2) activemodel (4.2.10)
multi_json (~> 1.3) activesupport (= 4.2.10)
thread_safe (~> 0.1) builder (~> 3.1)
tzinfo (~> 0.3.37) 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_commentable (4.0.2) acts_as_commentable (4.0.2)
acts_as_tree (2.1.0) acts_as_tree (2.9.1)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
arel (4.0.2) arel (6.0.4)
bcrypt (3.1.9) bcrypt (3.1.16)
bcrypt-ruby (3.1.2) bcrypt-ruby (3.1.2)
builder (3.1.4) builder (3.2.4)
cancan (1.6.10) cancan (1.6.10)
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.9.0) carrierwave (0.9.0)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
@ -46,162 +50,184 @@ GEM
coffee-rails (4.0.1) coffee-rails (4.0.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.8.0) coffee-script-source (1.12.2)
concurrent-ruby (1.0.5) commonjs (0.2.7)
devise (3.4.1) concurrent-ruby (1.1.8)
crass (1.0.6)
devise (4.8.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 4.1.0)
responders responders
thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
erubis (2.7.0) erubis (2.7.0)
execjs (2.2.2) execjs (2.8.1)
ffi (1.15.0)
formtastic (2.3.0) formtastic (2.3.0)
actionpack (>= 3.0) actionpack (>= 3.0)
formtastic-bootstrap (3.0.0) formtastic-bootstrap (3.0.0)
formtastic (>= 2.2) formtastic (>= 2.2)
geocoder (1.2.6) geocoder (1.6.7)
haml (4.1.0.beta.1) globalid (0.4.2)
activesupport (>= 4.2.0)
haml (5.2.1)
temple (>= 0.8.0)
tilt tilt
haml-rails (0.6.0) haml-rails (1.0.0)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
activesupport (>= 4.0.1) activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0) haml (>= 4.0.6, < 6.0)
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
highline (1.6.21) html2haml (2.2.0)
hike (1.2.3)
hpricot (0.8.6)
html2haml (1.0.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
haml (>= 4.0.0.rc.1) haml (>= 4.0, < 6)
hpricot (~> 0.8.6) nokogiri (>= 1.6.0)
ruby_parser (~> 3.1.1) ruby_parser (~> 3.5)
htmlentities (4.3.2) htmlentities (4.3.4)
i18n (0.9.5) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jbuilder (1.0.2) jbuilder (1.0.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
jquery-rails (3.1.2) jquery-rails (4.4.0)
railties (>= 3.0, < 5.0) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.3) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.1) json (2.5.1)
kaminari (0.16.1) kaminari (1.2.1)
actionpack (>= 3.0.0) activesupport (>= 4.1.0)
activesupport (>= 3.0.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-bootstrap (3.0.1) kaminari-bootstrap (3.0.1)
kaminari (>= 0.13.0) kaminari (>= 0.13.0)
rails rails
kgio (2.9.2) kaminari-core (1.2.1)
libv8 (3.16.14.7) kgio (2.11.3)
mail (2.7.0) 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) mini_mime (>= 0.1.1)
mini_mime (1.0.0) mini_mime (1.1.0)
mini_portile (0.6.1) mini_portile2 (2.4.0)
minitest (4.7.5) minitest (5.14.4)
multi_json (1.13.1) multi_json (1.15.0)
mysql2 (0.3.21) mysql2 (0.4.10)
net-scp (1.2.1) nokogiri (1.10.10)
net-ssh (>= 2.6.5) mini_portile2 (~> 2.4.0)
net-sftp (2.1.2) non-stupid-digest-assets (1.0.9)
net-ssh (>= 2.6.5) sprockets (>= 2.0)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
non-stupid-digest-assets (1.0.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paypal-sdk-core (0.3.1) paypal-sdk-core (0.3.4)
multi_json (~> 1.0) multi_json (~> 1.0)
xml-simple xml-simple
paypal-sdk-merchant (1.116.0) paypal-sdk-merchant (1.117.2)
paypal-sdk-core (~> 0.3.0) paypal-sdk-core (~> 0.3.0)
posix-spawn (0.3.9) posix-spawn (0.3.15)
pygments.rb (0.6.0) rack (1.6.13)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rack (1.5.5)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.13) rails (4.2.10)
actionmailer (= 4.0.13) actionmailer (= 4.2.10)
actionpack (= 4.0.13) actionpack (= 4.2.10)
activerecord (= 4.0.13) actionview (= 4.2.10)
activesupport (= 4.0.13) activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.13) railties (= 4.2.10)
sprockets-rails (~> 2.0) sprockets-rails
railties (4.0.13) rails-deprecated_sanitizer (1.0.4)
actionpack (= 4.0.13) activesupport (>= 4.2.0.alpha)
activesupport (= 4.0.13) 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) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.13.0) raindrops (0.19.1)
rake (12.3.0) rake (13.0.3)
rdoc (4.2.0) rdoc (6.3.1)
json (~> 1.4) redcarpet (3.5.1)
redcarpet (3.2.1) ref (2.0.0)
ref (1.0.5) responders (2.4.1)
responders (1.1.2) actionpack (>= 4.2.0, < 6.0)
railties (>= 3.2, < 4.2) railties (>= 4.2.0, < 6.0)
rmagick (2.13.4) rmagick (4.2.2)
ruby_parser (3.1.3) ruby_parser (3.15.1)
sexp_processor (~> 4.1) sexp_processor (~> 4.9)
rvm-capistrano (1.5.5) sass-rails (6.0.0)
capistrano (~> 2.15.4) sassc-rails (~> 2.1, >= 2.1.1)
sass (3.2.19) sassc (2.4.0)
sass-rails (4.0.5) ffi (~> 1.9)
railties (>= 4.0.0, < 5.0) sassc-rails (2.1.2)
sass (~> 3.2.2) railties (>= 4.0.0)
sprockets (~> 2.8, < 3.0) sassc (>= 2.0)
sprockets-rails (~> 2.0) sprockets (> 3.0)
sdoc (0.4.1) sprockets-rails
json (~> 1.7, >= 1.7.7) tilt
rdoc (~> 4.0) sdoc (2.1.0)
sexp_processor (4.4.4) rdoc (>= 5.0)
sprockets (2.12.4) sexp_processor (4.15.2)
hike (~> 1.2) sprockets (3.7.2)
multi_json (~> 1.0) concurrent-ruby (~> 1.0)
rack (~> 1.0) rack (> 1, < 3)
tilt (~> 1.1, != 1.3.0) sprockets-rails (3.2.2)
sprockets-rails (2.3.3) actionpack (>= 4.0)
actionpack (>= 3.0) activesupport (>= 4.0)
activesupport (>= 3.0) sprockets (>= 3.0.0)
sprockets (>= 2.8, < 4.0) temple (0.8.2)
therubyracer (0.12.1) therubyracer (0.12.3)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.15)
ref ref
thor (0.20.0) thor (1.1.0)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (1.4.1) tilt (2.0.10)
turbolinks (2.5.3) turbolinks (5.2.1)
coffee-rails turbolinks-source (~> 5.2)
twitter-bootstrap-rails (2.2.8) turbolinks-source (5.2.0)
twitter-bootstrap-rails (3.2.2)
actionpack (>= 3.1) actionpack (>= 3.1)
execjs execjs (>= 2.2.2, >= 2.2)
rails (>= 3.1) less-rails (>= 2.5.0)
railties (>= 3.1) railties (>= 3.1)
tzinfo (0.3.53) tzinfo (1.2.9)
uglifier (2.5.3) thread_safe (~> 0.1)
execjs (>= 0.3.0) uglifier (4.2.0)
json (>= 1.8.0) execjs (>= 0.3.0, < 3)
unicorn (4.6.3) unicorn (6.0.0)
kgio (~> 2.6) kgio (~> 2.6)
rack
raindrops (~> 0.7) raindrops (~> 0.7)
warden (1.2.3) warden (1.2.7)
rack (>= 1.0) rack (>= 1.0)
wicked_pdf (0.11.0) wicked_pdf (2.1.0)
rails activesupport
xml-simple (1.1.4) xml-simple (1.1.8)
yajl-ruby (1.1.0)
PLATFORMS PLATFORMS
ruby ruby
@ -211,7 +237,6 @@ DEPENDENCIES
acts_as_tree acts_as_tree
bcrypt-ruby (= 3.1.2) bcrypt-ruby (= 3.1.2)
cancan cancan
capistrano
carrierwave (= 0.9.0) carrierwave (= 0.9.0)
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
devise devise
@ -225,22 +250,22 @@ DEPENDENCIES
jquery-ui-rails jquery-ui-rails
kaminari kaminari
kaminari-bootstrap kaminari-bootstrap
mysql2 (~> 0.3.18) mysql2 (= 0.4.10)
net-ssh (~> 2.7.0)
nokogiri nokogiri
non-stupid-digest-assets non-stupid-digest-assets
paypal-sdk-merchant paypal-sdk-merchant
posix-spawn posix-spawn
pygments.rb rails (= 4.2.10)
rails (= 4.0.13)
redcarpet redcarpet
rmagick rmagick
rvm-capistrano
sass-rails sass-rails
sdoc sdoc
therubyracer therubyracer
turbolinks turbolinks
twitter-bootstrap-rails twitter-bootstrap-rails
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
unicorn (= 4.6.3) unicorn
wicked_pdf wicked_pdf
BUNDLED WITH
1.17.3

View File

@ -52,7 +52,7 @@ module Survey
# This will create an empty whitelist of attributes available for mass-assignment for all models # This will create an empty whitelist of attributes available for mass-assignment for all models
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
# parameters by using an attr_accessible or attr_protected declaration. # parameters by using an attr_accessible or attr_protected declaration.
config.active_record.whitelist_attributes = true #config.active_record.whitelist_attributes = true
config.assets.precompile += %w( plume_print.css public.js public.css admin.js admin.css forum.css forum.js plaquettes.css plaquettes.js connexion.js connexion.css ) config.assets.precompile += %w( plume_print.css public.js public.css admin.js admin.css forum.css forum.js plaquettes.css plaquettes.js connexion.js connexion.css )
end end

View File

@ -1,5 +1,5 @@
APP_RUBY=2.1.2 APP_RUBY=2.6.0
ENV=production ENV=production
APP_ROOT=/srv/www/web/pic_vert_app/current/ APP_ROOT=/srv/www/web/pic_vert_app/current/
GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY