suite
This commit is contained in:
parent
a7aef9b805
commit
027a423b66
13
Gemfile
13
Gemfile
@ -1,14 +1,13 @@
|
|||||||
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.9'
|
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 'sqlite3'
|
gem 'sqlite3'
|
||||||
gem 'mysql2'
|
gem 'mysql2', "0.4.10"
|
||||||
|
|
||||||
# Use Uglifier as compressor for JavaScript assets
|
# Use Uglifier as compressor for JavaScript assets
|
||||||
gem 'uglifier', '>= 1.3.0'
|
gem 'uglifier', '>= 1.3.0'
|
||||||
|
|
||||||
@ -43,7 +42,7 @@ gem 'formtastic-bootstrap'
|
|||||||
|
|
||||||
|
|
||||||
gem 'kaminari'
|
gem 'kaminari'
|
||||||
gem 'bootstrap3-kaminari-views'
|
#gem 'bootstrap3-kaminari-views'
|
||||||
|
|
||||||
|
|
||||||
gem 'carrierwave'
|
gem 'carrierwave'
|
||||||
@ -54,11 +53,7 @@ group :doc do
|
|||||||
gem 'sdoc', require: false
|
gem 'sdoc', require: false
|
||||||
end
|
end
|
||||||
|
|
||||||
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'
|
|
||||||
|
|
||||||
# Use unicorn as the app server
|
# Use unicorn as the app server
|
||||||
gem "unicorn"
|
gem "unicorn"
|
||||||
|
295
Gemfile.lock
295
Gemfile.lock
@ -1,169 +1,203 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.9)
|
actionmailer (4.2.10)
|
||||||
actionpack (= 4.0.9)
|
actionpack (= 4.2.10)
|
||||||
mail (~> 2.5.4)
|
actionview (= 4.2.10)
|
||||||
actionpack (4.0.9)
|
activejob (= 4.2.10)
|
||||||
activesupport (= 4.0.9)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
builder (~> 3.1.0)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
erubis (~> 2.7.0)
|
actionpack (4.2.10)
|
||||||
rack (~> 1.5.2)
|
actionview (= 4.2.10)
|
||||||
|
activesupport (= 4.2.10)
|
||||||
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
activemodel (4.0.9)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
activesupport (= 4.0.9)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
builder (~> 3.1.0)
|
actionview (4.2.10)
|
||||||
activerecord (4.0.9)
|
activesupport (= 4.2.10)
|
||||||
activemodel (= 4.0.9)
|
builder (~> 3.1)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
erubis (~> 2.7.0)
|
||||||
activesupport (= 4.0.9)
|
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.3)
|
activejob (4.2.10)
|
||||||
activesupport (4.0.9)
|
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)
|
||||||
acts_as_tree (2.0.0)
|
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)
|
activerecord (>= 3.0.0)
|
||||||
arel (4.0.2)
|
arel (6.0.4)
|
||||||
bcrypt (3.1.7)
|
bcrypt (3.1.16)
|
||||||
bcrypt-ruby (3.1.5)
|
bcrypt-ruby (3.1.5)
|
||||||
bcrypt (>= 3.1.3)
|
bcrypt (>= 3.1.3)
|
||||||
bootstrap3-kaminari-views (0.0.1)
|
builder (3.2.4)
|
||||||
kaminari
|
carrierwave (1.3.2)
|
||||||
rails (~> 4.0.0)
|
activemodel (>= 4.0.0)
|
||||||
builder (3.1.4)
|
activesupport (>= 4.0.0)
|
||||||
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.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)
|
||||||
|
commonjs (0.2.7)
|
||||||
|
concurrent-ruby (1.1.8)
|
||||||
|
crass (1.0.6)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.2.1)
|
execjs (2.8.1)
|
||||||
formtastic (3.0.0)
|
formtastic (3.1.5)
|
||||||
actionpack (>= 3.2.13)
|
actionpack (>= 3.2.13)
|
||||||
formtastic-bootstrap (3.0.0)
|
formtastic-bootstrap (3.1.1)
|
||||||
formtastic (>= 2.2)
|
formtastic (>= 3.0)
|
||||||
haml (4.0.5)
|
globalid (0.4.2)
|
||||||
|
activesupport (>= 4.2.0)
|
||||||
|
haml (5.2.1)
|
||||||
|
temple (>= 0.8.0)
|
||||||
tilt
|
tilt
|
||||||
haml-rails (0.5.3)
|
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)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
highline (1.6.21)
|
|
||||||
hike (1.2.3)
|
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)
|
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)
|
||||||
json (1.8.1)
|
kaminari (1.2.1)
|
||||||
kaminari (0.16.1)
|
activesupport (>= 4.1.0)
|
||||||
actionpack (>= 3.0.0)
|
kaminari-actionview (= 1.2.1)
|
||||||
activesupport (>= 3.0.0)
|
kaminari-activerecord (= 1.2.1)
|
||||||
kgio (2.9.2)
|
kaminari-core (= 1.2.1)
|
||||||
libv8 (3.16.14.7)
|
kaminari-actionview (1.2.1)
|
||||||
mail (2.5.4)
|
actionview
|
||||||
mime-types (~> 1.16)
|
kaminari-core (= 1.2.1)
|
||||||
treetop (~> 1.4.8)
|
kaminari-activerecord (1.2.1)
|
||||||
mime-types (1.25.1)
|
activerecord
|
||||||
mini_portile (0.6.0)
|
kaminari-core (= 1.2.1)
|
||||||
minitest (4.7.5)
|
kaminari-core (1.2.1)
|
||||||
multi_json (1.10.1)
|
kgio (2.11.3)
|
||||||
mysql2 (0.3.16)
|
less (2.6.0)
|
||||||
net-scp (1.2.1)
|
commonjs (~> 0.2.7)
|
||||||
net-ssh (>= 2.6.5)
|
less-rails (4.0.0)
|
||||||
net-sftp (2.1.2)
|
actionpack (>= 4)
|
||||||
net-ssh (>= 2.6.5)
|
less (~> 2.6.0)
|
||||||
net-ssh (2.7.0)
|
sprockets (>= 2)
|
||||||
net-ssh-gateway (1.2.0)
|
libv8 (3.16.14.19)
|
||||||
net-ssh (>= 2.6.5)
|
loofah (2.9.1)
|
||||||
nokogiri (1.6.3.1)
|
crass (~> 1.0.2)
|
||||||
mini_portile (= 0.6.0)
|
nokogiri (>= 1.5.9)
|
||||||
polyglot (0.3.5)
|
mail (2.7.1)
|
||||||
rack (1.5.2)
|
mini_mime (>= 0.1.1)
|
||||||
rack-test (0.6.2)
|
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)
|
||||||
|
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.0.9)
|
rails (4.2.10)
|
||||||
actionmailer (= 4.0.9)
|
actionmailer (= 4.2.10)
|
||||||
actionpack (= 4.0.9)
|
actionpack (= 4.2.10)
|
||||||
activerecord (= 4.0.9)
|
actionview (= 4.2.10)
|
||||||
activesupport (= 4.0.9)
|
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.9)
|
railties (= 4.2.10)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails
|
||||||
railties (4.0.9)
|
rails-deprecated_sanitizer (1.0.4)
|
||||||
actionpack (= 4.0.9)
|
activesupport (>= 4.2.0.alpha)
|
||||||
activesupport (= 4.0.9)
|
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 (10.3.2)
|
rake (13.0.3)
|
||||||
rdoc (4.1.2)
|
rdoc (6.3.1)
|
||||||
json (~> 1.4)
|
ref (2.0.0)
|
||||||
ref (1.0.5)
|
rmagick (4.2.2)
|
||||||
rmagick (2.13.3)
|
ruby_parser (3.15.1)
|
||||||
rvm-capistrano (1.5.4)
|
sexp_processor (~> 4.9)
|
||||||
capistrano (~> 2.15.4)
|
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.3)
|
sass-rails (4.0.5)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.2.0)
|
sass (~> 3.2.2)
|
||||||
sprockets (~> 2.8, <= 2.11.0)
|
sprockets (~> 2.8, < 3.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
sdoc (0.4.1)
|
sdoc (2.1.0)
|
||||||
json (~> 1.7, >= 1.7.7)
|
rdoc (>= 5.0)
|
||||||
rdoc (~> 4.0)
|
sexp_processor (4.15.2)
|
||||||
sprockets (2.11.0)
|
sprockets (2.12.5)
|
||||||
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.1.4)
|
sprockets-rails (2.3.3)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sqlite3 (1.3.9)
|
sqlite3 (1.4.2)
|
||||||
therubyracer (0.12.1)
|
ssrf_filter (1.0.7)
|
||||||
libv8 (~> 3.16.14.0)
|
temple (0.8.2)
|
||||||
|
therubyracer (0.12.3)
|
||||||
|
libv8 (~> 3.16.14.15)
|
||||||
ref
|
ref
|
||||||
thor (0.19.1)
|
thor (1.1.0)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.6)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
treetop (1.4.15)
|
turbolinks (5.2.1)
|
||||||
polyglot
|
turbolinks-source (~> 5.2)
|
||||||
polyglot (>= 0.3.1)
|
turbolinks-source (5.2.0)
|
||||||
turbolinks (2.3.0)
|
twitter-bootstrap-rails (3.2.2)
|
||||||
coffee-rails
|
|
||||||
twitter-bootstrap-rails (2.2.8)
|
|
||||||
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.41)
|
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.8.3)
|
unicorn (6.0.0)
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
@ -172,8 +206,6 @@ 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
|
||||||
@ -182,12 +214,10 @@ DEPENDENCIES
|
|||||||
jbuilder (~> 1.0.1)
|
jbuilder (~> 1.0.1)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari
|
kaminari
|
||||||
mysql2
|
mysql2 (= 0.4.10)
|
||||||
net-ssh (~> 2.7.0)
|
|
||||||
nokogiri
|
nokogiri
|
||||||
rails (= 4.0.9)
|
rails (= 4.2.10)
|
||||||
rmagick
|
rmagick
|
||||||
rvm-capistrano
|
|
||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc
|
sdoc
|
||||||
sqlite3
|
sqlite3
|
||||||
@ -196,3 +226,6 @@ DEPENDENCIES
|
|||||||
twitter-bootstrap-rails
|
twitter-bootstrap-rails
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
unicorn
|
unicorn
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.17.3
|
||||||
|
@ -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
|
||||||
|
@ -3,27 +3,29 @@
|
|||||||
#
|
#
|
||||||
# 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:
|
#
|
||||||
adapter: sqlite3
|
default: &default
|
||||||
database: db/developpment.sqlite3
|
adapter: mysql2
|
||||||
|
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:
|
||||||
adapter: sqlite3
|
<<: *default
|
||||||
database: db/test.sqlite3
|
database: db/test.sqlite3
|
||||||
pool: 5
|
|
||||||
timeout: 5000
|
|
||||||
|
|
||||||
production:
|
production:
|
||||||
adapter: mysql2
|
<<: *default
|
||||||
encoding: utf8mb4
|
|
||||||
database: laverie_app
|
database: laverie_app
|
||||||
pool: 5
|
|
||||||
username: laverie_app
|
username: laverie_app
|
||||||
password: laverie_app
|
password: laverie_prod
|
||||||
socket: /var/run/mysqld/mysqld.sock
|
socket: /var/run/mysqld/mysqld.sock
|
||||||
|
Loading…
x
Reference in New Issue
Block a user