Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-09-19 21:19:37 +0300
committerRobert Speicher <rspeicher@gmail.com>2017-12-20 00:45:07 +0300
commit6f1df8dfaabfebeb5e9ffbd785f263314b817324 (patch)
tree680362d9d011ac266ac3aa8f2288625146382adb /app/models
parent32ff813d3dccef6378361dff599eca44b05f46d4 (diff)
Accept arguments to blocked JSON serialization methods
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/blocks_json_serialization.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/blocks_json_serialization.rb b/app/models/concerns/blocks_json_serialization.rb
index cb70c22e207..75c6742260e 100644
--- a/app/models/concerns/blocks_json_serialization.rb
+++ b/app/models/concerns/blocks_json_serialization.rb
@@ -5,7 +5,7 @@
module BlocksJsonSerialization
extend ActiveSupport::Concern
- def to_json
+ def to_json(*args)
raise SecurityError,
"JSON serialization has been disabled on #{self.class.name}"
end