Merge remote-tracking branch 'upstream/pull/2182'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 0393c9e7fd87b42e0971a80f737d3401e1bdf45c..372b7d021740b2cecc5949a33d7122b42d0c532f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "5.2.2"
+gem "rails", "5.2.2.1"

 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -48,6 +48,7 @@ gem "actionpack-page_caching"
 gem "active_record_union"
 gem "cancancan"
 gem "composite_primary_keys", "~> 11.1.0"
 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"
 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 "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
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions