Compare commits

..

No commits in common. "e746dbd388315300d37d2765b8cf5424841c1a93" and "3c5d04a5f5490c28273b38fd6fe819f8ed613a83" have entirely different histories.

5 changed files with 154 additions and 184 deletions

15
Gemfile
View File

@ -1,13 +1,14 @@
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.2.10' gem 'rails', '4.0.9'
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 'sqlite3' gem 'sqlite3'
gem 'mysql2', "0.4.10" gem 'mysql2'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
@ -26,7 +27,7 @@ gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 1.0.1' gem 'jbuilder', '~> 1.0.1'
gem "therubyracer" gem "therubyracer", group: :production
#gem "less-rails" #gem "less-rails"
gem "sass-rails", "~> 4.0.3" gem "sass-rails", "~> 4.0.3"
gem "twitter-bootstrap-rails" gem "twitter-bootstrap-rails"
@ -42,7 +43,7 @@ gem 'formtastic-bootstrap'
gem 'kaminari' gem 'kaminari'
#gem 'bootstrap3-kaminari-views' gem 'bootstrap3-kaminari-views'
gem 'carrierwave' gem 'carrierwave'
@ -53,7 +54,11 @@ group :doc do
gem 'sdoc', require: false gem 'sdoc', require: false
end end
gem "capistrano", group: :development, require: false
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 # Use unicorn as the app server
gem "unicorn" gem "unicorn"

View File

@ -1,203 +1,169 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.10) actionmailer (4.0.9)
actionpack (= 4.2.10) actionpack (= 4.0.9)
actionview (= 4.2.10) mail (~> 2.5.4)
activejob (= 4.2.10) actionpack (4.0.9)
mail (~> 2.5, >= 2.5.4) activesupport (= 4.0.9)
rails-dom-testing (~> 1.0, >= 1.0.5) builder (~> 3.1.0)
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) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rack (~> 1.5.2)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rack-test (~> 0.6.2)
activejob (4.2.10) activemodel (4.0.9)
activesupport (= 4.2.10) activesupport (= 4.0.9)
globalid (>= 0.3.0) builder (~> 3.1.0)
activemodel (4.2.10) activerecord (4.0.9)
activesupport (= 4.2.10) activemodel (= 4.0.9)
builder (~> 3.1) activerecord-deprecated_finders (~> 1.0.2)
activerecord (4.2.10) activesupport (= 4.0.9)
activemodel (= 4.2.10) arel (~> 4.0.0)
activesupport (= 4.2.10) activerecord-deprecated_finders (1.0.3)
arel (~> 6.0) activesupport (4.0.9)
activesupport (4.2.10) i18n (~> 0.6, >= 0.6.9)
i18n (~> 0.7) minitest (~> 4.2)
minitest (~> 5.1) multi_json (~> 1.3)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.1)
tzinfo (~> 1.1) tzinfo (~> 0.3.37)
acts_as_tree (2.9.1) acts_as_tree (2.0.0)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
arel (6.0.4) arel (4.0.2)
bcrypt (3.1.16) bcrypt (3.1.7)
bcrypt-ruby (3.1.5) bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3) bcrypt (>= 3.1.3)
builder (3.2.4) bootstrap3-kaminari-views (0.0.1)
carrierwave (1.3.2) kaminari
activemodel (>= 4.0.0) rails (~> 4.0.0)
activesupport (>= 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)
mime-types (>= 1.16) mime-types (>= 1.16)
ssrf_filter (~> 1.0)
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.4.1) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.8.0)
commonjs (0.2.7)
concurrent-ruby (1.1.8)
crass (1.0.6)
erubis (2.7.0) erubis (2.7.0)
execjs (2.8.1) execjs (2.2.1)
formtastic (3.1.5) formtastic (3.0.0)
actionpack (>= 3.2.13) actionpack (>= 3.2.13)
formtastic-bootstrap (3.1.1) formtastic-bootstrap (3.0.0)
formtastic (>= 3.0) formtastic (>= 2.2)
globalid (0.4.2) haml (4.0.5)
activesupport (>= 4.2.0)
haml (5.2.1)
temple (>= 0.8.0)
tilt tilt
haml-rails (1.0.0) haml-rails (0.5.3)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
activesupport (>= 4.0.1) activesupport (>= 4.0.1)
haml (>= 4.0.6, < 6.0) haml (>= 3.1, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
highline (1.6.21)
hike (1.2.3) hike (1.2.3)
html2haml (2.2.0) i18n (0.6.11)
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) jbuilder (1.0.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
jquery-rails (4.4.0) jquery-rails (3.1.2)
rails-dom-testing (>= 1, < 3) railties (>= 3.0, < 5.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
kaminari (1.2.1) json (1.8.2)
activesupport (>= 4.1.0) kaminari (0.16.1)
kaminari-actionview (= 1.2.1) actionpack (>= 3.0.0)
kaminari-activerecord (= 1.2.1) activesupport (>= 3.0.0)
kaminari-core (= 1.2.1) kgio (2.9.2)
kaminari-actionview (1.2.1) libv8 (3.16.14.7)
actionview mail (2.5.4)
kaminari-core (= 1.2.1) mime-types (~> 1.16)
kaminari-activerecord (1.2.1) treetop (~> 1.4.8)
activerecord mime-types (1.25.1)
kaminari-core (= 1.2.1) mini_portile (0.6.0)
kaminari-core (1.2.1) minitest (4.7.5)
kgio (2.11.3) multi_json (1.10.1)
less (2.6.0) mysql2 (0.3.16)
commonjs (~> 0.2.7) net-scp (1.2.1)
less-rails (4.0.0) net-ssh (>= 2.6.5)
actionpack (>= 4) net-sftp (2.1.2)
less (~> 2.6.0) net-ssh (>= 2.6.5)
sprockets (>= 2) net-ssh (2.7.0)
libv8 (3.16.14.19) net-ssh-gateway (1.2.0)
loofah (2.9.1) net-ssh (>= 2.6.5)
crass (~> 1.0.2) nokogiri (1.6.3.1)
nokogiri (>= 1.5.9) mini_portile (= 0.6.0)
mail (2.7.1) polyglot (0.3.5)
mini_mime (>= 0.1.1) rack (1.5.2)
mime-types (3.3.1) rack-test (0.6.2)
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)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.10) rails (4.0.9)
actionmailer (= 4.2.10) actionmailer (= 4.0.9)
actionpack (= 4.2.10) actionpack (= 4.0.9)
actionview (= 4.2.10) activerecord (= 4.0.9)
activejob (= 4.2.10) activesupport (= 4.0.9)
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.2.10) railties (= 4.0.9)
sprockets-rails sprockets-rails (~> 2.0)
rails-deprecated_sanitizer (1.0.4) railties (4.0.9)
activesupport (>= 4.2.0.alpha) actionpack (= 4.0.9)
rails-dom-testing (1.0.9) activesupport (= 4.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.19.1) raindrops (0.13.0)
rake (13.0.3) rake (10.3.2)
rdoc (6.3.1) rdoc (4.1.2)
ref (2.0.0) json (~> 1.4)
rmagick (4.2.2) ref (1.0.5)
ruby_parser (3.15.1) rmagick (2.13.4)
sexp_processor (~> 4.9) rvm-capistrano (1.5.4)
capistrano (~> 2.15.4)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.5) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2) sass (~> 3.2.0)
sprockets (~> 2.8, < 3.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
sdoc (2.1.0) sdoc (0.4.1)
rdoc (>= 5.0) json (~> 1.7, >= 1.7.7)
sexp_processor (4.15.2) rdoc (~> 4.0)
sprockets (2.12.5) sprockets (2.11.0)
hike (~> 1.2) hike (~> 1.2)
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.3.3) sprockets-rails (2.1.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (~> 2.8)
sqlite3 (1.4.2) sqlite3 (1.3.9)
ssrf_filter (1.0.7) therubyracer (0.12.1)
temple (0.8.2) libv8 (~> 3.16.14.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref ref
thor (1.1.0) thor (0.19.1)
thread_safe (0.3.6) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
turbolinks (5.2.1) treetop (1.4.15)
turbolinks-source (~> 5.2) polyglot
turbolinks-source (5.2.0) polyglot (>= 0.3.1)
twitter-bootstrap-rails (3.2.2) turbolinks (2.3.0)
coffee-rails
twitter-bootstrap-rails (2.2.8)
actionpack (>= 3.1) actionpack (>= 3.1)
execjs (>= 2.2.2, >= 2.2) execjs
less-rails (>= 2.5.0) rails (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
tzinfo (1.2.9) tzinfo (0.3.41)
thread_safe (~> 0.1) uglifier (2.5.3)
uglifier (4.2.0) execjs (>= 0.3.0)
execjs (>= 0.3.0, < 3) json (>= 1.8.0)
unicorn (6.0.0) unicorn (4.8.3)
kgio (~> 2.6) kgio (~> 2.6)
rack
raindrops (~> 0.7) raindrops (~> 0.7)
PLATFORMS PLATFORMS
@ -206,6 +172,8 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
acts_as_tree acts_as_tree
bcrypt-ruby (~> 3.1.2) bcrypt-ruby (~> 3.1.2)
bootstrap3-kaminari-views
capistrano
carrierwave carrierwave
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
formtastic formtastic
@ -214,10 +182,12 @@ DEPENDENCIES
jbuilder (~> 1.0.1) jbuilder (~> 1.0.1)
jquery-rails jquery-rails
kaminari kaminari
mysql2 (= 0.4.10) mysql2
net-ssh (~> 2.7.0)
nokogiri nokogiri
rails (= 4.2.10) rails (= 4.0.9)
rmagick rmagick
rvm-capistrano
sass-rails (~> 4.0.3) sass-rails (~> 4.0.3)
sdoc sdoc
sqlite3 sqlite3
@ -226,6 +196,3 @@ DEPENDENCIES
twitter-bootstrap-rails twitter-bootstrap-rails
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
unicorn unicorn
BUNDLED WITH
1.17.3

View File

@ -51,7 +51,7 @@ module SimpleLux
# 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
# Enable the asset pipeline # Enable the asset pipeline
config.assets.enabled = true config.assets.enabled = true

View File

@ -3,29 +3,27 @@
# #
# Ensure the SQLite 3 gem is defined in your Gemfile # Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3' # gem 'sqlite3'
# development:
default: &default adapter: sqlite3
adapter: mysql2 database: db/developpment.sqlite3
encoding: utf8mb4
database: laverie_app
pool: 5 pool: 5
timeout: 5000 timeout: 5000
development:
<<: *default
username: root
socket: /tmp/mysql.sock
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
<<: *default adapter: sqlite3
database: db/test.sqlite3 database: db/test.sqlite3
pool: 5
timeout: 5000
production: production:
<<: *default adapter: mysql2
encoding: utf8mb4
database: laverie_app database: laverie_app
pool: 5
username: laverie_app username: laverie_app
password: laverie_prod password: laverie_app
socket: /var/run/mysqld/mysqld.sock socket: /var/run/mysqld/mysqld.sock

View File

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