Merge branch 'blackst0ne-rails5-replace-true-values-with-false-values' into 'master'

[Rails5] Add FALSE_VALUES constant to Service#boolean_accessor See merge request gitlab-org/gitlab-ce!18240

Merge branch 'blackst0ne-rails5-replace-true-values-with-false-values' into 'master'
1917d53b · Sean McGivern · e7ddb40c · 432e57fc · 1917d53b
Commit 1917d53b authored Apr 09, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

service.rb app/models/service.rb +5 -1

No files found.
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -206,7 +206,11 @@ class Service < ActiveRecord::Base
    args.each do |arg|
      class_eval %{
        def #{arg}?
-          ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(#{arg})
+          if Gitlab.rails5?
+            !ActiveModel::Type::Boolean::FALSE_VALUES.include?(#{arg})
+          else
+            ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(#{arg})
+          end
        end
      }
    end