From 4afd17b2786b5bca075ac7508979fad582c65bc9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 1 Sep 2016 13:48:20 +0100
Subject: Included groups on project_members page

---
 app/controllers/projects/group_links_controller.rb     | 12 ++++++++++++
 app/controllers/projects/project_members_controller.rb |  1 +
 2 files changed, 13 insertions(+)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index d0c4550733c..57c54bf625a 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -19,9 +19,21 @@ class Projects::GroupLinksController < Projects::ApplicationController
     redirect_to namespace_project_group_links_path(project.namespace, project)
   end
 
+  def update
+    @group_link = @project.project_group_links.find(params[:id])
+
+    @group_link.update_attributes(group_link_params)
+  end
+
   def destroy
     project.project_group_links.find(params[:id]).destroy
 
     redirect_to namespace_project_group_links_path(project.namespace, project)
   end
+
+  protected
+
+  def group_link_params
+    params.require(:group_link).permit(:group_access, :expires_at)
+  end
 end
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 42a7e5a2c30..d83e95cf097 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -5,6 +5,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
 
   def index
+    @groups = @project.project_group_links.all
     @project_members = @project.project_members
     @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
 
-- 
cgit v1.2.1


From 23993147fbf24e868d33927dc1194b60a106076d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 1 Sep 2016 14:13:49 +0100
Subject: Fixed issue with groups not displaying

---
 app/controllers/projects/project_members_controller.rb | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index d83e95cf097..6060ddf025b 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
     @project_members = @project_members.order('access_level DESC')
 
-    @group = @project.group
-
-    if @group
-      @group_members = @group.group_members
-      @group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group)
-
-      if params[:search].present?
-        users = @group.users.search(params[:search]).to_a
-        @group_members = @group_members.where(user_id: users)
-      end
-
-      @group_members = @group_members.order('access_level DESC')
-    end
-
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
 
     @project_member = @project.project_members.new
-- 
cgit v1.2.1


From e33cda96cb20f47fdde4314f6bb00e43bbf5aeb4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 1 Sep 2016 15:27:42 +0100
Subject: Fixed group members not deleting Combine both group members & project
 members in project members list

---
 app/controllers/projects/project_members_controller.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 6060ddf025b..abb92938211 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -6,15 +6,16 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
   def index
     @groups = @project.project_group_links.all
-    @project_members = @project.project_members
+    @project_members = @project.team.members.all
+    @project_members_size = @project_members.size
+    @group_members = @project.group.group_members
     @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
 
     if params[:search].present?
-      users = @project.users.search(params[:search]).to_a
-      @project_members = @project_members.where(user_id: users)
+      @project_members = @project_members.search(params[:search])
     end
 
-    @project_members = @project_members.order('access_level DESC')
+    @project_members = @project_members.page(params[:page])
 
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
 
-- 
cgit v1.2.1


From e477ad44565dbe69e3f0200f4f4f7bebbd48cb15 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 09:25:53 +0100
Subject: Removes row from dom when deleting Fixed spacing with buttons
 Disables group form when user doesnt have correct permissions

---
 app/controllers/projects/project_members_controller.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index abb92938211..cd31653698c 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -5,11 +5,9 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
 
   def index
-    @groups = @project.project_group_links.all
-    @project_members = @project.team.members.all
+    @groups = @project.project_group_links
+    @project_members = @project.team.members(can?(current_user, :admin_project, @project))
     @project_members_size = @project_members.size
-    @group_members = @project.group.group_members
-    @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
 
     if params[:search].present?
       @project_members = @project_members.search(params[:search])
@@ -20,7 +18,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
 
     @project_member = @project.project_members.new
-    @project_group_links = @project.project_group_links
   end
 
   def create
-- 
cgit v1.2.1


From b3d75ac5135130522f253d4b09f72a7c0a8e2f80 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 09:28:25 +0100
Subject: Return 403 if user can't update group

---
 app/controllers/projects/group_links_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index 57c54bf625a..b5e314dced3 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -21,6 +21,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
 
   def update
     @group_link = @project.project_group_links.find(params[:id])
+    return render_403 unless can?(current_user, action_member_permission(:admin, @group_link.group), @group_link.group)
 
     @group_link.update_attributes(group_link_params)
   end
-- 
cgit v1.2.1


From cdc55db3452ca82f0dbdcdb631a1fc48abdf1f84 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 10:13:49 +0100
Subject: Fixed members error

---
 app/controllers/projects/project_members_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index cd31653698c..617dd9823b9 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -6,7 +6,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
   def index
     @groups = @project.project_group_links
-    @project_members = @project.team.members(can?(current_user, :admin_project, @project))
+    @project_members = @project.team.members(!can?(current_user, :admin_project, @project))
     @project_members_size = @project_members.size
 
     if params[:search].present?
-- 
cgit v1.2.1


From 3e19f1976f9a13fc1b13ec49b3ce31c3e114a454 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 10:50:06 +0100
Subject: Fixed issue with invited users not showing up

---
 app/controllers/projects/project_members_controller.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 617dd9823b9..2175a5d8dcb 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -6,7 +6,19 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
   def index
     @groups = @project.project_group_links
-    @project_members = @project.team.members(!can?(current_user, :admin_project, @project))
+
+    members = []
+    project_members = @project.project_members
+    project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
+    members << project_members.pluck(:id)
+
+    if @project.group
+      group_members = @project.group.group_members
+      group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
+      members << group_members.pluck(:id)
+    end
+
+    @project_members = Member.where(id: members)
     @project_members_size = @project_members.size
 
     if params[:search].present?
-- 
cgit v1.2.1


From 931d09f481d5e174a984c6f874e67273ba2864f0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 10:52:17 +0100
Subject: Fixed search

---
 .../projects/project_members_controller.rb          | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 2175a5d8dcb..7581833eacc 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -10,21 +10,30 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     members = []
     project_members = @project.project_members
     project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
+
+    if params[:search].present?
+      users = @project.users.search(params[:search]).to_a
+      project_members = project_members.where(user_id: users)
+    end
+
     members << project_members.pluck(:id)
 
-    if @project.group
-      group_members = @project.group.group_members
+    @group = @project.group
+    if @group
+      group_members = @group.group_members
       group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
+
+      if params[:search].present?
+        users = @group.users.search(params[:search]).to_a
+        group_members = group_members.where(user_id: users)
+      end
+
       members << group_members.pluck(:id)
     end
 
     @project_members = Member.where(id: members)
     @project_members_size = @project_members.size
 
-    if params[:search].present?
-      @project_members = @project_members.search(params[:search])
-    end
-
     @project_members = @project_members.page(params[:page])
 
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
-- 
cgit v1.2.1


From 2c3fa33ca2e75792d1027eb73e2f69fed67bc435 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 15:10:22 +0100
Subject: Updated some specs Fixed issue with group name not showing

---
 .../projects/project_members_controller.rb            | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 7581833eacc..bf6ac25266a 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -7,7 +7,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   def index
     @groups = @project.project_group_links
 
-    members = []
     project_members = @project.project_members
     project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
 
@@ -16,25 +15,25 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       project_members = project_members.where(user_id: users)
     end
 
-    members << project_members.pluck(:id)
+    members_ids = project_members.pluck(:id)
 
-    @group = @project.group
-    if @group
-      group_members = @group.group_members
+    group = @project.group
+    if group
+      group_members = group.group_members
       group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
 
       if params[:search].present?
-        users = @group.users.search(params[:search]).to_a
+        users = group.users.search(params[:search]).to_a
         group_members = group_members.where(user_id: users)
       end
 
-      members << group_members.pluck(:id)
+      members_ids << group_members.pluck(:id)
     end
 
-    @project_members = Member.where(id: members)
-    @project_members_size = @project_members.size
+    @members = Member.where(id: members_ids.flatten)
+    @members_size = @members.size
 
-    @project_members = @project_members.page(params[:page])
+    @members = @members.page(params[:page])
 
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
 
-- 
cgit v1.2.1


From 97a51817bf1e6b0504bb84b686daf7e931ded2da Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 17:39:16 +0100
Subject: Fixed error when updating groups

---
 app/controllers/projects/group_links_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index b5e314dced3..3574ecf2811 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -21,7 +21,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
 
   def update
     @group_link = @project.project_group_links.find(params[:id])
-    return render_403 unless can?(current_user, action_member_permission(:admin, @group_link.group), @group_link.group)
+    return render_403 unless can?(current_user, :admin_group, @group_link.group)
 
     @group_link.update_attributes(group_link_params)
   end
-- 
cgit v1.2.1


From e747626fad5c0e675d6a5cd5b6fcd482f10dad90 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 5 Sep 2016 09:24:47 +0100
Subject: Added test for updating groups permissions

---
 app/controllers/projects/group_links_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index 3574ecf2811..7b4c39cdb8f 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -21,7 +21,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
 
   def update
     @group_link = @project.project_group_links.find(params[:id])
-    return render_403 unless can?(current_user, :admin_group, @group_link.group)
+    return render_403 unless can?(current_user, :admin_project_member, @project)
 
     @group_link.update_attributes(group_link_params)
   end
-- 
cgit v1.2.1


From 73c4da1780c5086543eb998d5bc9cbd632ef6576 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 6 Sep 2016 16:20:20 +0100
Subject: Fixed removing groups

---
 app/controllers/projects/group_links_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index 7b4c39cdb8f..7b6f07465e0 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -29,7 +29,12 @@ class Projects::GroupLinksController < Projects::ApplicationController
   def destroy
     project.project_group_links.find(params[:id]).destroy
 
-    redirect_to namespace_project_group_links_path(project.namespace, project)
+    respond_to do |format|
+      format.html do
+        redirect_to namespace_project_group_links_path(project.namespace, project)
+      end
+      format.js { head :ok }
+    end
   end
 
   protected
-- 
cgit v1.2.1


From 2b41db9215f322ba61113a7bef2f49da157bbd53 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 6 Sep 2016 16:48:48 +0100
Subject: Search project groups

---
 .../projects/project_members_controller.rb         | 49 ++++++++++++++++++----
 1 file changed, 41 insertions(+), 8 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index bf6ac25266a..ac83377148a 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -10,23 +10,30 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     project_members = @project.project_members
     project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
 
-    if params[:search].present?
-      users = @project.users.search(params[:search]).to_a
-      project_members = project_members.where(user_id: users)
-    end
-
-    members_ids = project_members.pluck(:id)
-
     group = @project.group
+
     if group
       group_members = group.group_members
       group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
+    end
+
+    if params[:search].present?
+      groups_id = @groups.pluck(:group_id)
+      groups = Group.where(id: groups_id).search(params[:search]).to_a
+      @groups = @project.project_group_links.where(group_id: groups)
+
+      users = @project.users.search(params[:search]).to_a
+      project_members = project_members.where(user_id: users)
 
-      if params[:search].present?
+      if group_members
         users = group.users.search(params[:search]).to_a
         group_members = group_members.where(user_id: users)
       end
+    end
 
+    members_ids = project_members.pluck(:id)
+
+    if group_members
       members_ids << group_members.pluck(:id)
     end
 
@@ -48,6 +55,17 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       current_user: current_user
     )
 
+    group_ids = params[:group_ids].split(',')
+    groups = Group.where(id: group_ids)
+
+    groups.each do |group|
+      project.project_group_links.create(
+        group: group,
+        group_access: params[:access_level],
+        expires_at: params[:expires_at]
+      )
+    end
+
     redirect_to namespace_project_project_members_path(@project.namespace, @project)
   end
 
@@ -101,6 +119,21 @@ class Projects::ProjectMembersController < Projects::ApplicationController
                 notice: notice)
   end
 
+  def options
+    users = User.all
+    users = users.search(params[:search]) if params[:search].present?
+    users = users.page(1)
+
+    groups = Group.all
+    groups = groups.search(params[:search]) if params[:search].present?
+    groups = groups.page(1)
+
+    render json: {
+      Groups: groups.as_json(only: [:id, :name], methods: [:avatar_url]),
+      Users: users.as_json(only: [:id, :name, :username], methods: [:avatar_url]),
+    }
+  end
+
   protected
 
   def member_params
-- 
cgit v1.2.1


From 401b797671b9b67ef40c4afa75acdeca83b6a6de Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 6 Sep 2016 17:11:58 +0100
Subject: Fixed bug when group_ids not present when creating

---
 .../projects/project_members_controller.rb           | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index ac83377148a..d49598d2786 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -55,15 +55,17 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       current_user: current_user
     )
 
-    group_ids = params[:group_ids].split(',')
-    groups = Group.where(id: group_ids)
-
-    groups.each do |group|
-      project.project_group_links.create(
-        group: group,
-        group_access: params[:access_level],
-        expires_at: params[:expires_at]
-      )
+    if params[:group_ids].present?
+      group_ids = params[:group_ids].split(',')
+      groups = Group.where(id: group_ids)
+
+      groups.each do |group|
+        project.project_group_links.create(
+          group: group,
+          group_access: params[:access_level],
+          expires_at: params[:expires_at]
+        )
+      end
     end
 
     redirect_to namespace_project_project_members_path(@project.namespace, @project)
-- 
cgit v1.2.1


From 2abbb0980f061d4297aab02f914c324c7fbe073b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 7 Sep 2016 14:26:07 +0100
Subject: Removed group members from the list for now

---
 .../projects/project_members_controller.rb         | 25 ----------------------
 1 file changed, 25 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index d49598d2786..64cbc76da6f 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -10,33 +10,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     project_members = @project.project_members
     project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
 
-    group = @project.group
-
-    if group
-      group_members = group.group_members
-      group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
-    end
-
-    if params[:search].present?
-      groups_id = @groups.pluck(:group_id)
-      groups = Group.where(id: groups_id).search(params[:search]).to_a
-      @groups = @project.project_group_links.where(group_id: groups)
-
-      users = @project.users.search(params[:search]).to_a
-      project_members = project_members.where(user_id: users)
-
-      if group_members
-        users = group.users.search(params[:search]).to_a
-        group_members = group_members.where(user_id: users)
-      end
-    end
-
     members_ids = project_members.pluck(:id)
 
-    if group_members
-      members_ids << group_members.pluck(:id)
-    end
-
     @members = Member.where(id: members_ids.flatten)
     @members_size = @members.size
 
-- 
cgit v1.2.1


From 7cca8ffe60f4cdc7ca012cf223c6d7855b928685 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 8 Sep 2016 10:45:53 +0100
Subject: Ruby update

---
 app/controllers/projects/project_members_controller.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 64cbc76da6f..1c49ebfb99d 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -7,15 +7,15 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   def index
     @groups = @project.project_group_links
 
-    project_members = @project.project_members
-    project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
+    @project_members = @project.project_members
+    @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
 
-    members_ids = project_members.pluck(:id)
-
-    @members = Member.where(id: members_ids.flatten)
-    @members_size = @members.size
+    if params[:search].present?
+      users = @project.users.search(params[:search]).to_a
+      @project_members = @project_members.where(user_id: users)
+    end
 
-    @members = @members.page(params[:page])
+    @project_members = @project_members.page(params[:page])
 
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
 
-- 
cgit v1.2.1


From b61cd8a3930f194333ea417a03d53a0ad91efa42 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 9 Sep 2016 10:45:55 +0100
Subject: Added back ordering

---
 app/controllers/projects/project_members_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 1c49ebfb99d..5fd2e77a51a 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -15,6 +15,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       @project_members = @project_members.where(user_id: users)
     end
 
+    @project_members = @project_members.order('access_level DESC')
     @project_members = @project_members.page(params[:page])
 
     @requesters = @project.requesters if can?(current_user, :admin_project, @project)
-- 
cgit v1.2.1


From aac80d76c272523a1ee7c9ef751034e955dfab9e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 9 Sep 2016 11:31:57 +0100
Subject: Group links search test fix

---
 app/controllers/projects/project_members_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 5fd2e77a51a..4d27617608d 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -13,6 +13,10 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     if params[:search].present?
       users = @project.users.search(params[:search]).to_a
       @project_members = @project_members.where(user_id: users)
+
+      group_ids = @groups.pluck(:group_id)
+      group_ids = Group.where(id: group_ids).search(params[:search]).to_a
+      @groups = @project.project_group_links.where(group_id: group_ids)
     end
 
     @project_members = @project_members.order('access_level DESC')
-- 
cgit v1.2.1


From c2602aaff3f78ad12e1cc06136a7345699951454 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 4 Oct 2016 14:40:03 +0100
Subject: Updated Ruby

---
 app/controllers/projects/group_links_controller.rb     | 2 +-
 app/controllers/projects/project_members_controller.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index 7b6f07465e0..2994d8c9666 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -1,6 +1,7 @@
 class Projects::GroupLinksController < Projects::ApplicationController
   layout 'project_settings'
   before_action :authorize_admin_project!
+  before_action :authorize_admin_project_member!, only: [:update]
 
   def index
     @group_links = project.project_group_links.all
@@ -21,7 +22,6 @@ class Projects::GroupLinksController < Projects::ApplicationController
 
   def update
     @group_link = @project.project_group_links.find(params[:id])
-    return render_403 unless can?(current_user, :admin_project_member, @project)
 
     @group_link.update_attributes(group_link_params)
   end
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index eb1bf445a7d..870dc8abbd4 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -19,8 +19,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       @groups = @project.project_group_links.where(group_id: group_ids)
     end
 
-    @project_members = @project_members.order('access_level DESC')
-    @project_members = @project_members.page(params[:page])
+    @project_members = @project_members.order(access_level: :desc).page(params[:page])
 
     @requesters = AccessRequestsFinder.new(@project).execute(current_user)
 
@@ -40,6 +39,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       groups = Group.where(id: group_ids)
 
       groups.each do |group|
+        next unless can?(current_user, :read_group, group)
+        
         project.project_group_links.create(
           group: group,
           group_access: params[:access_level],
-- 
cgit v1.2.1


From a0eaff14124b829ccc02df951bd7cb7d3abb7708 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 5 Oct 2016 14:37:03 +0100
Subject: Updated Ruby variable name Fixed Ruby code based on review feedback

---
 app/controllers/projects/project_members_controller.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 870dc8abbd4..b2c8656d124 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -5,7 +5,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
 
   def index
-    @groups = @project.project_group_links
+    @group_links = @project.project_group_links
 
     @project_members = @project.project_members
     @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
@@ -14,9 +14,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       users = @project.users.search(params[:search]).to_a
       @project_members = @project_members.where(user_id: users)
 
-      group_ids = @groups.pluck(:group_id)
-      group_ids = Group.where(id: group_ids).search(params[:search]).to_a
-      @groups = @project.project_group_links.where(group_id: group_ids)
+      @group_links = @project.project_group_links.where(group_id: @project.invited_groups.search(params[:search]).select(:id))
     end
 
     @project_members = @project_members.order(access_level: :desc).page(params[:page])
@@ -40,7 +38,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
       groups.each do |group|
         next unless can?(current_user, :read_group, group)
-        
+
         project.project_group_links.create(
           group: group,
           group_access: params[:access_level],
-- 
cgit v1.2.1


From 6865c46c6649118e09e60dd29dfa060470010aa9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 6 Oct 2016 15:41:00 +0100
Subject: Changed how collections are rendered Used variables in haml for
 replicated checks Fixed broken conflict

---
 app/controllers/projects/project_members_controller.rb | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 67b41c4573a..37a86ed0523 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -98,21 +98,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
                 notice: notice)
   end
 
-  def options
-    users = User.all
-    users = users.search(params[:search]) if params[:search].present?
-    users = users.page(1)
-
-    groups = Group.all
-    groups = groups.search(params[:search]) if params[:search].present?
-    groups = groups.page(1)
-
-    render json: {
-      Groups: groups.as_json(only: [:id, :name], methods: [:avatar_url]),
-      Users: users.as_json(only: [:id, :name, :username], methods: [:avatar_url]),
-    }
-  end
-
   protected
 
   def member_params
-- 
cgit v1.2.1


From 6a4f71008390752e6b5574a9e9bdf277732d852d Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Tue, 4 Oct 2016 16:03:13 +0200
Subject: Show what time ago a MR was deployed

---
 .../projects/merge_requests_controller.rb          | 31 +++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 869d96b86f4..28225fbb762 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -393,11 +393,40 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
+    environments = @merge_request.environments
+    deployments = @merge_request.deployments
+
+    if environments.present?
+      environments = environments.select { |e| can?(current_user, :read_environment, e) }.map do |environment|
+        project = environment.project
+        deployment = deployments.find { |d| d.environment == environment }
+
+        environment = {
+           name: environment.name,
+           id: environment.id,
+           url: namespace_project_environment_path(project.namespace, project, environment),
+           external_url: environment.external_url,
+           deployed_at: deployment ? deployment.created_at : nil
+         }
+
+        if environment[:external_url]
+          environment[:external_url_formatted] = environment[:external_url].gsub(/\A.*?:\/\//, '')
+        end
+
+        if environment[:deployed_at]
+          environment[:deployed_at_formatted] = environment[:deployed_at].to_time.in_time_zone.to_s(:medium)
+        end
+
+        environment
+      end
+    end
+
     response = {
       title: merge_request.title,
       sha: merge_request.diff_head_commit.short_id,
       status: status,
-      coverage: coverage
+      coverage: coverage,
+      environments: environments
     }
 
     render json: response
-- 
cgit v1.2.1


From fa58068b2894b900d4b2519825411e0710557fc6 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Wed, 5 Oct 2016 13:52:15 +0200
Subject: Refactor ci_status on MergeRequestController

---
 .../projects/merge_requests_controller.rb          | 45 ++++++++++------------
 1 file changed, 20 insertions(+), 25 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 28225fbb762..00043c5a4c0 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -393,33 +393,28 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
-    environments = @merge_request.environments
-    deployments = @merge_request.deployments
-
-    if environments.present?
-      environments = environments.select { |e| can?(current_user, :read_environment, e) }.map do |environment|
-        project = environment.project
-        deployment = deployments.find { |d| d.environment == environment }
-
-        environment = {
-           name: environment.name,
-           id: environment.id,
-           url: namespace_project_environment_path(project.namespace, project, environment),
-           external_url: environment.external_url,
-           deployed_at: deployment ? deployment.created_at : nil
-         }
-
-        if environment[:external_url]
-          environment[:external_url_formatted] = environment[:external_url].gsub(/\A.*?:\/\//, '')
-        end
-
-        if environment[:deployed_at]
-          environment[:deployed_at_formatted] = environment[:deployed_at].to_time.in_time_zone.to_s(:medium)
-        end
+    environments = @merge_request.environments.map do |environment|
+      next unless can?(current_user, :read_environment, environment)
+
+      deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
+      environment = {
+        name: environment.name,
+        id: environment.id,
+        url: namespace_project_environment_path(@project.namespace, @project, environment),
+        external_url: environment.external_url,
+        deployed_at: deployment ? deployment.created_at : nil
+      }
+
+      if environment[:external_url]
+        environment[:external_url_formatted] = environment[:external_url].gsub(/\A.*?:\/\//, '')
+      end
 
-        environment
+      if environment[:deployed_at]
+        environment[:deployed_at_formatted] = environment[:deployed_at].to_time.in_time_zone.to_s(:medium)
       end
-    end
+
+      environment
+    end.compact
 
     response = {
       title: merge_request.title,
-- 
cgit v1.2.1


From 58368fbc53bfe7c2a9b425626819eae576afff09 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Fri, 7 Oct 2016 23:10:06 +0100
Subject: Moved ci_status environments logic to new action
 ci_envrionments_status and set up frontend polling

---
 .../projects/merge_requests_controller.rb          | 38 ++++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 00043c5a4c0..e17d560138f 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -10,7 +10,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_action :module_enabled
   before_action :merge_request, only: [
     :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :pipelines, :merge, :merge_check,
-    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
+    :ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
   ]
   before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds, :pipelines]
   before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :builds, :pipelines]
@@ -393,11 +393,23 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
-    environments = @merge_request.environments.map do |environment|
+    response = {
+      title: merge_request.title,
+      sha: merge_request.diff_head_commit.short_id,
+      status: status,
+      coverage: coverage
+    }
+
+    render json: response
+  end
+
+  def ci_environments_status
+    render json: @merge_request.environments.map do |environment|
       next unless can?(current_user, :read_environment, environment)
 
       deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
-      environment = {
+
+      environment_data = {
         name: environment.name,
         id: environment.id,
         url: namespace_project_environment_path(@project.namespace, @project, environment),
@@ -405,26 +417,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         deployed_at: deployment ? deployment.created_at : nil
       }
 
-      if environment[:external_url]
-        environment[:external_url_formatted] = environment[:external_url].gsub(/\A.*?:\/\//, '')
+      if environment_data[:external_url]
+        environment_data[:external_url_formatted] = environment_data[:external_url].gsub(/\A.*?:\/\//, '')
       end
 
-      if environment[:deployed_at]
-        environment[:deployed_at_formatted] = environment[:deployed_at].to_time.in_time_zone.to_s(:medium)
+      if environment_data[:deployed_at]
+        environment_data[:deployed_at_formatted] = environment_data[:deployed_at].to_time.in_time_zone.to_s(:medium)
       end
 
-      environment
+      environment_data
     end.compact
-
-    response = {
-      title: merge_request.title,
-      sha: merge_request.diff_head_commit.short_id,
-      status: status,
-      coverage: coverage,
-      environments: environments
-    }
-
-    render json: response
   end
 
   protected
-- 
cgit v1.2.1


From 88b03bb542a8480d61c260a9dc3769ab791995e5 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Mon, 10 Oct 2016 20:38:48 +0200
Subject: Rename method in test

---
 .../projects/merge_requests_controller.rb          | 41 ++++++++++++----------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e17d560138f..5f7f46cf566 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -404,29 +404,34 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def ci_environments_status
-    render json: @merge_request.environments.map do |environment|
-      next unless can?(current_user, :read_environment, environment)
-
-      deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
+    environments = 
+      begin
+        @merge_request.environments.map do |environment|
+          next unless can?(current_user, :read_environment, environment)
+
+          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
+
+          environment_data = {
+            name: environment.name,
+            id: environment.id,
+            url: namespace_project_environment_path(@project.namespace, @project, environment),
+            external_url: environment.external_url,
+            deployed_at: deployment ? deployment.created_at : nil
+          }
 
-      environment_data = {
-        name: environment.name,
-        id: environment.id,
-        url: namespace_project_environment_path(@project.namespace, @project, environment),
-        external_url: environment.external_url,
-        deployed_at: deployment ? deployment.created_at : nil
-      }
+          if environment_data[:external_url]
+            environment_data[:external_url_formatted] = environment_data[:external_url].gsub(/\A.*?:\/\//, '')
+          end
 
-      if environment_data[:external_url]
-        environment_data[:external_url_formatted] = environment_data[:external_url].gsub(/\A.*?:\/\//, '')
-      end
+          if environment_data[:deployed_at]
+            environment_data[:deployed_at_formatted] = environment_data[:deployed_at].to_time.in_time_zone.to_s(:medium)
+          end
 
-      if environment_data[:deployed_at]
-        environment_data[:deployed_at_formatted] = environment_data[:deployed_at].to_time.in_time_zone.to_s(:medium)
+          environment_data
+        end.compact
       end
 
-      environment_data
-    end.compact
+    render json: environments
   end
 
   protected
-- 
cgit v1.2.1


From 35e2315a66e34f290230720cfa74240fd5532970 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Wed, 12 Oct 2016 15:21:01 +0200
Subject: Minor style improvement

---
 .../projects/merge_requests_controller.rb            | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 5f7f46cf566..5c802798028 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -404,30 +404,22 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def ci_environments_status
-    environments = 
+    environments =
       begin
         @merge_request.environments.map do |environment|
           next unless can?(current_user, :read_environment, environment)
 
           deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
 
-          environment_data = {
-            name: environment.name,
+          {
             id: environment.id,
+            name: environment.name,
             url: namespace_project_environment_path(@project.namespace, @project, environment),
             external_url: environment.external_url,
-            deployed_at: deployment ? deployment.created_at : nil
+            external_url_formatted: environment.formatted_external_url,
+            deployed_at: deployment.try(:created_at),
+            deployed_at_formatted: deployment.try(:formatted_deployment_time)
           }
-
-          if environment_data[:external_url]
-            environment_data[:external_url_formatted] = environment_data[:external_url].gsub(/\A.*?:\/\//, '')
-          end
-
-          if environment_data[:deployed_at]
-            environment_data[:deployed_at_formatted] = environment_data[:deployed_at].to_time.in_time_zone.to_s(:medium)
-          end
-
-          environment_data
         end.compact
       end
 
-- 
cgit v1.2.1


From cf15af31353b141028717456aa6967c9c11697af Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Thu, 13 Oct 2016 14:23:18 +0200
Subject: Add test, fix merge error

---
 app/controllers/projects/merge_requests_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/controllers/projects')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 5c802798028..9207c954335 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -409,12 +409,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         @merge_request.environments.map do |environment|
           next unless can?(current_user, :read_environment, environment)
 
+          project = environment.project
           deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
 
           {
             id: environment.id,
             name: environment.name,
-            url: namespace_project_environment_path(@project.namespace, @project, environment),
+            url: namespace_project_environment_path(project.namespace, project, environment),
             external_url: environment.external_url,
             external_url_formatted: environment.formatted_external_url,
             deployed_at: deployment.try(:created_at),
-- 
cgit v1.2.1