Remove application.yml step from travis config

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index fa1bed46886eccae3b083b73794ba3a85e878e1a..96d696561129b4a13ede9d13635791b07dab79b6 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,7 @@ gem "actionpack-page_caching"
 gem "active_record_union"
 gem "cancancan"
 gem "composite_primary_keys", "~> 11.1.0"
+gem "config"
 gem "delayed_job_active_record"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
@@ -58,7 +59,7 @@ gem "paperclip", "~> 5.2"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
-gem "rinku", ">= 1.2.2", :require => "rails_rinku"
+gem "rinku", "= 2.0.4", :require => "rails_rinku"
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
@@ -117,6 +118,9 @@ gem "logstasher"
 # Used to generate images for traces
 gem "gd2-ffij"
 
+# Used for browser detection
+gem "browser"
+
 # Gems useful for development
 group :development do
   gem "annotate"