From 59ab1d19cd400e6de91c846769c6ace5aa9f0f3d Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sun, 9 Mar 2014 23:34:04 +0100
Subject: [PATCH] =?UTF-8?q?Changements=20mineurs,=20apr=C3=A8s=20un=20essa?=
 =?UTF-8?q?i=20d'int=C3=A9gration=20avec=20refinerycms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         | 80 ++++++++++++++++++++++++++++++
 Gemfile                            |  9 ++--
 Gemfile.lock                       |  5 +-
 config/environments/development.rb |  4 +-
 config/environments/production.rb  |  6 ++-
 config/environments/test.rb        |  4 +-
 6 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a502e99..fc1d6c38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,83 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /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
+
diff --git a/Gemfile b/Gemfile
index 5f560163..11adc812 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,9 +16,12 @@ gem 'coffee-rails'
 
 # Use jquery as the JavaScript library
 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
 gem 'turbolinks'
+gem 'jquery-turbolinks'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder'
@@ -43,15 +46,15 @@ end
 gem 'haml-rails'
 gem 'compass-rails', '1.1.3'
 gem 'modernizr-rails'
-gem 'gritter'
 gem 'activeadmin', github: 'gregbell/active_admin'
 gem 'rails-i18n'
 gem 'devise-i18n'
-gem 'jquery-turbolinks'
 gem 'font-awesome-rails'
-gem 'has_scope'
+
 gem 'simple_calendar', github: 'echarp/simple_calendar'
 #gem 'simple_calendar', github: 'excid3/simple_calendar', branch: '1.0'
+
+# Markdown display
 gem 'redcarpet'
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 86e2e0f1..2af753b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git://github.com/gregbell/active_admin.git
-  revision: 739b93bf9d22c89c099cb25a3eeb770726575a13
+  revision: 9ca081f47ab447793afbd0cb2ba1eded68c26f10
   specs:
     activeadmin (1.0.0.pre)
       arbre (~> 1.0)
@@ -235,7 +235,7 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (2.2.1)
       coffee-rails
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -257,7 +257,6 @@ DEPENDENCIES
   guard-livereload
   guard-minitest
   haml-rails
-  has_scope
   jbuilder
   jquery-rails
   jquery-turbolinks
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ffa47b6c..42abefaf 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -14,7 +14,9 @@ AgendaDuLibreRails::Application.configure do
   config.action_controller.perform_caching = false
 
   # 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.
   config.active_support.deprecation = :log
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a984ea47..3972bd79 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -27,7 +27,7 @@ AgendaDuLibreRails::Application.configure do
   # config.assets.css_compressor = :sass
 
   # 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.
   config.assets.digest = true
@@ -63,7 +63,9 @@ AgendaDuLibreRails::Application.configure do
 
   # 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.
-  # 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
   # the I18n.default_locale when a translation can not be found).
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a804cda5..b9ee2e9a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -29,7 +29,9 @@ AgendaDuLibreRails::Application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # 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.
   config.active_support.deprecation = :stderr