[Rails5] Add FALSE_VALUES constant to Service#boolean_accessor

In Rails 5.0 the `ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES` constant has been removed [1] and the remaining `FALSE_VALUES` constant has been moved to `ActiveModel::Type::Boolean` [2] [1]: https://github.com/rails/rails/commit/a502703c3d2151d4d3b421b29fefdac5ad05df61 [2]: https://github.com/rails/rails/commit/9cc8c6f3730df3d94c81a55be9ee1b7b4ffd29f6

[Rails5] Add FALSE_VALUES constant to Service#boolean_accessor
432e57fc · blackst0ne · aade8b36 · 432e57fc
Commit 432e57fc authored Apr 08, 2018 by blackst0ne
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