diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 06:06:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 06:06:12 +0300 |
| commit | f155cc9034f2247c5d368f9b0212ad44248b0c5e (patch) | |
| tree | 902480293b665d74a337aeae6a0521104f561988 /lib/gitlab/patch | |
| parent | c920712fab6abdc37de9444e6bbcd170c295b21a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/patch')
| -rw-r--r-- | lib/gitlab/patch/prependable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/patch/prependable.rb b/lib/gitlab/patch/prependable.rb index a9f6cfb19cb..22ece0a6a8b 100644 --- a/lib/gitlab/patch/prependable.rb +++ b/lib/gitlab/patch/prependable.rb @@ -24,7 +24,7 @@ module Gitlab super if const_defined?(:ClassMethods) - klass_methods = const_get(:ClassMethods) + klass_methods = const_get(:ClassMethods, false) base.singleton_class.prepend klass_methods base.instance_variable_set(:@_prepended_class_methods, klass_methods) end @@ -40,7 +40,7 @@ module Gitlab super if instance_variable_defined?(:@_prepended_class_methods) - const_get(:ClassMethods).prepend @_prepended_class_methods + const_get(:ClassMethods, false).prepend @_prepended_class_methods end end |