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

app/controllers/application_controller.rb

@@ -189,8 +189,8 @@ class ApplicationController < ActionController::Base
 	# 资料是否完善
 	def check_account
 		if !current_user.profile_completed?
-			info_url = '/account/profile'
-			tip_exception(402, info_url)
+			#info_url = '/account/profile'
+			tip_exception(402)
 		end
 	end
 

app/views/memos/_memo.json.jbuilder

@@ -10,6 +10,6 @@ json.memo do
   json.tag memo.tag_repertoires.map(&:name)
   json.time memo.created_at
   json.replies_count memo.all_replies_count
-  json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 0 ? true : false
+  json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 0
   json.memo_praise_count memo.praise_treads.liker.count
 end