Skip to content
Extraits de code Groupes Projets
Valider 59ab1d19 rédigé par echarp's avatar echarp
Parcourir les fichiers

Changements mineurs, après un essai d'intégration avec refinerycms

parent e7902523
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -14,3 +14,83 @@ ...@@ -14,3 +14,83 @@
# Ignore all logfiles and tempfiles. # Ignore all logfiles and tempfiles.
/log/*.log /log/*.log
/tmp /tmp
# Rails
.bundle
db/*.sqlite3
db/*.sqlite3-journal
*.log
tmp
tmp/**/*
# Documentation
doc/api
doc/app
.yardoc
.yardopts
coverage
# Public Uploads
public/system/*
public/themes/*
# Public Cache
public/javascripts/cache
public/stylesheets/cache
public/refinery/*
# Vendor Cache
vendor/cache
# Acts as Indexed
index/**/*
# Refinery Specific
*.tmproj
*.autobackupbyrefinery.*
refinerycms-*.gem
# Mac
.DS_Store
# Windows
Thumbs.db
# NetBeans
nbproject
# Eclipse
.project
# Redcar
.redcar
# Rubinius
*.rbc
# Vim
*.swp
*.swo
# RubyMine
.idea
# E-texteditor
.eprj
# Backup
*~
# Capybara Bug
capybara-*html
# sass
.sass-cache
.sass-cache/*
#rvm
.rvmrc
.rvmrc.*
# vendor/extensions dummy applications.
vendor/extensions/**/spec/dummy
...@@ -16,9 +16,12 @@ gem 'coffee-rails' ...@@ -16,9 +16,12 @@ gem 'coffee-rails'
# Use jquery as the JavaScript library # Use jquery as the JavaScript library
gem 'jquery-rails' gem 'jquery-rails'
# Messages and notifications displayed nicely using javascript
gem 'gritter'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks' gem 'turbolinks'
gem 'jquery-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' gem 'jbuilder'
...@@ -43,15 +46,15 @@ end ...@@ -43,15 +46,15 @@ end
gem 'haml-rails' gem 'haml-rails'
gem 'compass-rails', '1.1.3' gem 'compass-rails', '1.1.3'
gem 'modernizr-rails' gem 'modernizr-rails'
gem 'gritter'
gem 'activeadmin', github: 'gregbell/active_admin' gem 'activeadmin', github: 'gregbell/active_admin'
gem 'rails-i18n' gem 'rails-i18n'
gem 'devise-i18n' gem 'devise-i18n'
gem 'jquery-turbolinks'
gem 'font-awesome-rails' gem 'font-awesome-rails'
gem 'has_scope'
gem 'simple_calendar', github: 'echarp/simple_calendar' gem 'simple_calendar', github: 'echarp/simple_calendar'
#gem 'simple_calendar', github: 'excid3/simple_calendar', branch: '1.0' #gem 'simple_calendar', github: 'excid3/simple_calendar', branch: '1.0'
# Markdown display
gem 'redcarpet' gem 'redcarpet'
group :development do group :development do
......
...@@ -7,7 +7,7 @@ GIT ...@@ -7,7 +7,7 @@ GIT
GIT GIT
remote: git://github.com/gregbell/active_admin.git remote: git://github.com/gregbell/active_admin.git
revision: 739b93bf9d22c89c099cb25a3eeb770726575a13 revision: 9ca081f47ab447793afbd0cb2ba1eded68c26f10
specs: specs:
activeadmin (1.0.0.pre) activeadmin (1.0.0.pre)
arbre (~> 1.0) arbre (~> 1.0)
...@@ -235,7 +235,7 @@ GEM ...@@ -235,7 +235,7 @@ GEM
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turbolinks (2.2.1) turbolinks (2.2.1)
coffee-rails coffee-rails
tzinfo (0.3.38) tzinfo (0.3.39)
uglifier (2.4.0) uglifier (2.4.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
...@@ -257,7 +257,6 @@ DEPENDENCIES ...@@ -257,7 +257,6 @@ DEPENDENCIES
guard-livereload guard-livereload
guard-minitest guard-minitest
haml-rails haml-rails
has_scope
jbuilder jbuilder
jquery-rails jquery-rails
jquery-turbolinks jquery-turbolinks
......
...@@ -14,7 +14,9 @@ AgendaDuLibreRails::Application.configure do ...@@ -14,7 +14,9 @@ AgendaDuLibreRails::Application.configure do
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
# Don't care if the mailer can't send. # Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false if config.respond_to?(:action_mailer)
config.action_mailer.raise_delivery_errors = false
end
# Print deprecation notices to the Rails logger. # Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log config.active_support.deprecation = :log
......
...@@ -27,7 +27,7 @@ AgendaDuLibreRails::Application.configure do ...@@ -27,7 +27,7 @@ AgendaDuLibreRails::Application.configure do
# config.assets.css_compressor = :sass # config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed. # Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false config.assets.compile = true
# Generate digests for assets URLs. # Generate digests for assets URLs.
config.assets.digest = true config.assets.digest = true
...@@ -63,7 +63,9 @@ AgendaDuLibreRails::Application.configure do ...@@ -63,7 +63,9 @@ AgendaDuLibreRails::Application.configure do
# Ignore bad email addresses and do not raise email delivery errors. # Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false if config.respond_to?(:action_mailer)
# config.action_mailer.raise_delivery_errors = false
end
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found). # the I18n.default_locale when a translation can not be found).
......
...@@ -29,7 +29,9 @@ AgendaDuLibreRails::Application.configure do ...@@ -29,7 +29,9 @@ AgendaDuLibreRails::Application.configure do
# Tell Action Mailer not to deliver emails to the real world. # Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the # The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array. # ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test if config.respond_to?(:action_mailer)
config.action_mailer.delivery_method = :test
end
# Print deprecation notices to the stderr. # Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr config.active_support.deprecation = :stderr
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter