rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity

fix merge

Browse Source
This commit is contained in:
Peng DU 2016-06-27 12:49:20 +02:00
parent 6db26e7a19
commit 4eea18a479
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/members_controller.rb
View File

@ -17,16 +17,12 @@ class API::MembersController < API::ApiController
end
def last_subscribed
<<<<<<< HEAD
@members = User.active.with_role(:member).includes(profile: [:user_avatar]).where('is_allow_contact = true AND confirmed_at IS NOT NULL').order('created_at desc').limit(params[:last])
=======
@query = User.active.with_role(:member).includes(:profile).where('is_allow_contact = true AND confirmed_at IS NOT NULL').order('created_at desc').limit(params[:last])
@query = User.active.with_role(:member).includes(profile: [:user_avatar]).where('is_allow_contact = true AND confirmed_at IS NOT NULL').order('created_at desc').limit(params[:last])
# remove unmerged profiles from list
@members = @query.to_a
@members.delete_if { |u| u.need_completion? }
>>>>>>> 9ab28c1df60ab3b3a06b76025dba26d6151aa0ba
@requested_attributes = ['profile']
render :index
end