Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · Jun 22, 2018 · 1451c10 · 1451c10
2 parents 8cbd85c + c6be1e4
commit 1451c10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -15,6 +15,6 @@ gem "rails_xss", "~> 0.4.0"
 gem "file_signature", "~> 1.2.0"
 gem "syntax", "~> 1.1.0"
 gem "maruku", :git => 'https://github.com/distler/maruku.git', :branch => 'nokogiri'
-gem 'iconv', :platforms => [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :x64_mingw, :mingw_23, :mingw_24]
+gem 'iconv'
 gem 'rdoc-data', :platforms => :ruby_18
 gem 'test-unit', '~> 2.5.5'
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/bigdecimal/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/bigdecimal/conversions.rb
@@ -13,7 +13,7 @@ def self.included(base) #:nodoc:
             alias_method :_original_to_s, :to_s
             alias_method :to_s, :to_formatted_s
 
-            yaml_as YAML_TAG
+            method_defined?(:yaml_as) ? yaml_as(YAML_TAG) : yaml_tag(YAML_TAG)
           end
         end