Author: Hugo Melo <hugo@riseup.net>
Merge branch 'master' of github.com:samasti/noosfero
%!v(PANIC=String method: strings: negative Repeat count)
diff --git a/config/Gemfile b/config/Gemfile index 43ad2640cffe9785f8f1794db31a7c522e30e81d..6d0efd2ad41ff170260b91c2746f34df27f9430a 100644 --- a/config/Gemfile +++ b/config/Gemfile @@ -47,8 +47,8 @@ platform :ruby do gem 'unicode' group :performance do # FIXME: stack level too deep - #gem 'oj' - #gem 'oj_mimic_json' + gem 'oj' + gem 'oj_mimic_json' gem 'fast_blank' gem 'gctools' if RUBY_VERSION >= '2.1.0' and RUBY_VERSION < '2.2.0' diff --git a/plugins/orders/views/orders_plugin/shared/daterangepicker/_init.html.slim b/plugins/orders/views/orders_plugin/shared/daterangepicker/_init.html.slim index dbedab3b6c88df55fd6b446dbe6fc5d78889316f..fc78af36f496e5959890d945b1468c7d2d97d8af 100644 --- a/plugins/orders/views/orders_plugin/shared/daterangepicker/_init.html.slim +++ b/plugins/orders/views/orders_plugin/shared/daterangepicker/_init.html.slim @@ -6,7 +6,7 @@ = javascript_include_tag '/assets/plugins/orders/javascripts/moment-with-locales.js' = javascript_include_tag '/assets/plugins/orders/javascripts/daterangepicker.js' javascript: - moment.locale(#{I18n.locale.downcase.to_json}) + moment.locale("#{I18n.locale.downcase.to_s}") orders.daterangepicker.defaultOptions = { autoApply: true,