DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into develop_v2

Browse source 
# Conflicts:
#	Gemfile.lock
#	db/schema.rb
This commit is contained in:
Xavier J 2016-11-17 16:55:41 +01:00
commit 647eaa4ba8
34 changed files with 509 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/deploy.rb
View file

@ -99,6 +99,7 @@ set :shared_paths, [
'config/initializers/mailjet.rb',
'config/initializers/storage_url.rb',
'app/views/root/landing.html.haml',
'app/views/layouts/_google_analytics.html',
'app/views/cgu/index.html.haml'
]
@ -143,6 +144,9 @@ task :setup => :environment do
queue! %[mkdir -p "#{deploy_to}/shared/views/cgu"]
queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/views/cgu"]
queue! %[mkdir -p "#{deploy_to}/shared/views/layouts"]
queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/views/layouts"]
queue! %[mkdir -p "#{deploy_to}/shared/config/locales/dynamics"]
queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config/locales/dynamics"]