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

Merge branch 'staging'

Browse source
This commit is contained in:
Xavier J 2016-11-17 12:36:13 +01:00
commit 60d9522a65
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.html.haml
View file

@ -54,6 +54,6 @@
=link_to 'Contact', "mailto:"+t('dynamics.contact_email') =link_to 'Contact', "mailto:"+t('dynamics.contact_email')
= render partial: 'layouts/google_analytics'

4
config/deploy.rb
View file

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