Download as
Browse Code »

Commit 9f52b3bce16a5aca3ba2ee0f57429b3482f3acc8

Authored by Victor Costa
2 parents 3b7df6e8 cebdccf8
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'api' into production

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
@@ -25,7 +25,7 @@ gem 'grape', '~> 0.12' @@ -25,7 +25,7 @@ gem 'grape', '~> 0.12'
25 gem 'grape-entity' 25 gem 'grape-entity'
26 #FIXME Get the Grape Loggin from master yo solve this issue https://github.com/intridea/grape/issues/1059 26 #FIXME Get the Grape Loggin from master yo solve this issue https://github.com/intridea/grape/issues/1059
27 #We have to remove this commit referenve code when update the next release of grape_logging. Actualy we are using (1.1.2) 27 #We have to remove this commit referenve code when update the next release of grape_logging. Actualy we are using (1.1.2)
28 -gem 'grape_logging', :git => 'https://github.com/aceunreal/grape_logging.git', :ref => '100091b' 28 +gem 'grape_logging', :git => 'https://github.com/aceunreal/grape_logging.git', :ref => 'f1755ae'
29 gem 'rack-cors' 29 gem 'rack-cors'
30 gem 'rack-contrib' 30 gem 'rack-contrib'
31 gem 'liquid', '~> 3.0.3' 31 gem 'liquid', '~> 3.0.3'
config/application.rb
  Diff comments   View file @9f52b3b
@@ -73,7 +73,7 @@ module Noosfero @@ -73,7 +73,7 @@ module Noosfero
73 config.encoding = "utf-8" 73 config.encoding = "utf-8"
74 74
75 # Configure sensitive parameters which will be filtered from the log file. 75 # Configure sensitive parameters which will be filtered from the log file.
76 - config.filter_parameters += [:password] 76 + config.filter_parameters += [:password, :password_confirmation]
77 77
78 # Enable escaping HTML in JSON. 78 # Enable escaping HTML in JSON.
79 ActiveSupport::JSON::Encoding.escape_html_entities_in_json = true 79 ActiveSupport::JSON::Encoding.escape_html_entities_in_json = true