summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNur Rony <pro.nmrony@gmail.com>2016-10-21 19:25:49 +0600
committerNur Rony <pro.nmrony@gmail.com>2016-11-10 14:42:37 +0600
commita1b13e11c3dcf84c168145f2e22fb709a05c2d2f (patch)
tree8ad823b4e0dc559bb5e87cab0c0270af24360a06
parent69b87086be70c2fe8822adb44f3c32996f8dab9f (diff)
downloadgitlab-ce-a1b13e11c3dcf84c168145f2e22fb709a05c2d2f.tar.gz
removes extra new line
-rw-r--r--app/controllers/projects/project_members_controller.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index b86a45970b1..d1b6ecbd081 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -11,7 +11,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
if params[:search].present?
-
@project_members = @project_members.joins(:user).merge(User.sort(@sort = params[:sort]))
@group_links = @project.project_group_links.where(group_id: @project.invited_groups.search(params[:search]).select(:id))
end