jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

This commit is contained in:
cxt 2016-04-08 14:38:43 +08:00
parent eee7b89388 5241dddca2
commit 15ce3ba7e9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/mobile/middleware/error_handler.rb
View File

@ -7,7 +7,7 @@ module Mobile
@app.call(@env) @app.call(@env)
rescue =>e rescue =>e
message = {status: 1, message: e.message }.to_json message = {status: 1, message: e.message }.to_json
puts(e.backtrace.join("\n")) if Rails.env.development? Rails.logger.error e
status = 200 status = 200
headers = { 'Content-Type' => content_type } headers = { 'Content-Type' => content_type }
Rack::Response.new([message], status, headers).finish Rack::Response.new([message], status, headers).finish

2
app/models/mailer.rb
View File

@ -1143,7 +1143,7 @@ class Mailer < ActionMailer::Base
color:"#173177" color:"#173177"
}, },
keyword3:{ keyword3:{
value:h(truncate(key3, :length=>50, :omission=> '...')), value:key3,
color:"#173177" color:"#173177"
}, },
remark:{ remark:{