From dc749263774134fcd3f55f5ff62288f082eb954c Mon Sep 17 00:00:00 2001 From: echarp Date: Sat, 4 Oct 2014 15:19:52 +0200 Subject: [PATCH] =?UTF-8?q?Le=20timeout=20pour=20le=20geocoding=20n'est=20?= =?UTF-8?q?plus=20n=C3=A9cessaire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 ++ Gemfile.lock | 27 ++++++++++++++++++++++++++- config/initializers/geocoder.rb | 4 ---- config/secrets.yml | 6 +++--- 4 files changed, 31 insertions(+), 8 deletions(-) delete mode 100644 config/initializers/geocoder.rb diff --git a/Gemfile b/Gemfile index 07acc9da..5a130968 100644 --- a/Gemfile +++ b/Gemfile @@ -89,6 +89,8 @@ gem 'tinymce-rails-langs' # SEO optimisations gem 'meta-tags' +gem 'twitter' + group :development do # Spring speeds up development by keeping your application running in the # background. Read more: https://github.com/rails/spring diff --git a/Gemfile.lock b/Gemfile.lock index efa9dd9d..b79ef259 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,6 +55,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + addressable (2.3.6) arbre (1.0.2) activesupport (>= 3.0.0) arel (5.0.1.20140414130214) @@ -76,6 +77,7 @@ GEM sass (~> 3.0) slim (>= 1.3.6, < 3.0) terminal-table (~> 1.4) + buftok (0.2.0) builder (3.2.2) celluloid (0.16.0) timers (~> 4.0.0) @@ -94,10 +96,11 @@ GEM sass (~> 3.2.19) compass-rails (2.0.0) compass (>= 0.12.2) - devise (3.3.0) + devise (3.4.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) devise-i18n (0.11.2) @@ -108,9 +111,12 @@ GEM http_parser.rb (~> 0.6.0) email_validator (1.4.0) activemodel + equalizer (0.0.9) erubis (2.7.0) eventmachine (1.0.3) execjs (2.2.1) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) fastercsv (1.5.5) ffi (1.9.5) font-awesome-rails (4.2.0.0) @@ -155,6 +161,8 @@ GEM highline (1.6.21) hike (1.2.3) hitimes (1.2.2) + http (0.6.2) + http_parser.rb (~> 0.6.0) http_accept_language (2.0.2) http_parser.rb (0.6.0) i18n (0.6.11) @@ -185,6 +193,8 @@ GEM lumberjack (1.0.9) mail (2.6.1) mime-types (>= 1.16, < 3) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) meta-tags (2.0.0) actionpack (>= 3.0.0) method_source (0.8.2) @@ -192,7 +202,9 @@ GEM minitest (5.4.2) modernizr-rails (2.7.1) multi_json (1.10.1) + multipart-post (2.0.0) mysql2 (0.3.16) + naught (1.0.0) orm_adapter (0.5.0) parser (2.2.0.pre.5) ast (>= 1.1, < 3.0) @@ -270,6 +282,7 @@ GEM sexp_processor (4.4.4) simple_calendar (1.1.5) rails (>= 3.0) + simple_oauth (0.2.0) simplecov (0.9.1) docile (~> 1.1.0) multi_json (~> 1.0) @@ -306,6 +319,17 @@ GEM tinymce-rails (~> 4.0) turbolinks (2.4.0) coffee-rails + twitter (5.11.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.9) + faraday (~> 0.9.0) + http (~> 0.6.0) + http_parser.rb (~> 0.6.0) + json (~> 1.8) + memoizable (~> 0.4.0) + naught (~> 1.0) + simple_oauth (~> 0.2.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.5.3) @@ -363,6 +387,7 @@ DEPENDENCIES tinymce-rails tinymce-rails-langs turbolinks + twitter uglifier webrick (>= 1.3.1) webshims-rails diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb deleted file mode 100644 index 551607e4..00000000 --- a/config/initializers/geocoder.rb +++ /dev/null @@ -1,4 +0,0 @@ -Geocoder.configure( - # geocoding service request timeout, in seconds (default 3): - timeout: 10 -) diff --git a/config/secrets.yml b/config/secrets.yml index e834686d..caee94b5 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -19,8 +19,8 @@ test: # Do not keep production secrets in the repository, # instead read values from the environment. production: - secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> + secret_key_base: <%= ENV['SECRET_KEY_BASE'] %> production_be: - secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> + secret_key_base: <%= ENV['SECRET_KEY_BASE'] %> production_ch: - secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> + secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>