diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-15 12:06:56 +0300 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-16 12:48:41 +0300 |
| commit | 56296f1edadf2bc5f7741cbb3f97cb41f090aac6 (patch) | |
| tree | 5a21667acd7d431f155d12227181dcfc6d21cba8 /app/models/concerns/enum_with_nil.rb | |
| parent | 8b4602041cf2c4a8738a4796d78720017249249f (diff) | |
Remove rails4 specific code
Diffstat (limited to 'app/models/concerns/enum_with_nil.rb')
| -rw-r--r-- | app/models/concerns/enum_with_nil.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/concerns/enum_with_nil.rb b/app/models/concerns/enum_with_nil.rb index 23acfe9a55f..6d0a21cf070 100644 --- a/app/models/concerns/enum_with_nil.rb +++ b/app/models/concerns/enum_with_nil.rb @@ -16,7 +16,7 @@ module EnumWithNil # E.g. for enum_with_nil failure_reason: { unknown_failure: nil } # this overrides auto-generated method `unknown_failure?` define_method("#{key_with_nil}?") do - Gitlab.rails5? ? self[name].nil? : super() + self[name].nil? end # E.g. for enum_with_nil failure_reason: { unknown_failure: nil } @@ -24,7 +24,6 @@ module EnumWithNil define_method(name) do orig = super() - return orig unless Gitlab.rails5? return orig unless orig.nil? self.class.public_send(name.to_s.pluralize).key(nil) # rubocop:disable GitlabSecurity/PublicSend |