Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

5 years ago · 07d06ff9d3
parent fe2ff1a3d3 4723c715ec
commit 07d06ff9d3
2 changed files with 1 additions and 2 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -378,7 +378,6 @@ DEPENDENCIES
  kaminari (~> 1.1, >= 1.1.1)
  listen (>= 3.0.5, < 3.2)
  mysql2 (>= 0.4.4, < 0.6.0)
-  newrelic_rpm
  oauth2
  pdfkit
  puma (~> 3.11)
--- a/app/views/users/_user.json.jbuilder
+++ b/app/views/users/_user.json.jbuilder
@ -4,5 +4,5 @@ json.name user.full_name
 json.grade user.grade
 json.identity user&.user_extension&.identity
 # json.email user.mail # 邮箱原则上不暴露的，如果实在需要的话只能对某些具体的接口公开
-json.image_url url_to_avatar(user)
+json.image_url image_tag(url_to_avatar(user))
 json.school user.school_name