diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
| commit | f1cbea77a4a52929244198dcbde26d63d837489a (patch) | |
| tree | 82645dbc9eec65f870ce7a211355deb6bdc29f29 /config/initializers | |
| parent | 21e28a5caa5e92165322c4127c89a6f88e68198a (diff) | |
| parent | 8ca91cef45417947607079118b1af07c9774ae58 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/oj.rb | 1 | ||||
| -rw-r--r-- | config/initializers/rabl_init.rb | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/config/initializers/oj.rb b/config/initializers/oj.rb new file mode 100644 index 000000000..de3e17f2e --- /dev/null +++ b/config/initializers/oj.rb @@ -0,0 +1 @@ +Oj.default_options = { mode: :compat, time_format: :ruby, use_to_json: true } diff --git a/config/initializers/rabl_init.rb b/config/initializers/rabl_init.rb deleted file mode 100644 index 132a42144..000000000 --- a/config/initializers/rabl_init.rb +++ /dev/null @@ -1,7 +0,0 @@ -Rabl.configure do |config| - config.json_engine = Oj - config.cache_all_output = false - config.cache_sources = Rails.env.production? - config.include_json_root = false - config.view_paths = [Rails.root.join('app/views')] -end |