Merge branch 'rails5-boolean-cast' into 'master'

Fix boolean casting for nil value Closes #46925 See merge request gitlab-org/gitlab-ce!19202

Merge branch 'rails5-boolean-cast' into 'master'
1058973f · Rémy Coutable · a51c5773 · 884fbf1d · 1058973f
Commit 1058973f authored May 30, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

service.rb app/models/service.rb +3 -2

No files found.
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -206,10 +206,11 @@ class Service < ActiveRecord::Base
    args.each do |arg|
      class_eval %{
        def #{arg}?
+          # '!!' is used because nil or empty string is converted to nil
          if Gitlab.rails5?
-            !ActiveModel::Type::Boolean::FALSE_VALUES.include?(#{arg})
+            !!ActiveRecord::Type::Boolean.new.cast(#{arg})
          else
-            ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(#{arg})
+            !!ActiveRecord::Type::Boolean.new.type_cast_from_database(#{arg})
          end
        end
      }