diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2016-12-23 16:29:00 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-03 10:52:14 -0600 |
| commit | ad58dec2e1564e9c2d23dd32e5da8b12eeba965d (patch) | |
| tree | 2d0877f1244b492a57c780aabd425b2a253ed4d9 /app/controllers/projects/group_links_controller.rb | |
| parent | def6c43da15a38e1211cf733442efe01824e5150 (diff) | |
| download | gitlab-ce-ad58dec2e1564e9c2d23dd32e5da8b12eeba965d.tar.gz | |
Added groups to members section, added a members finder
Diffstat (limited to 'app/controllers/projects/group_links_controller.rb')
| -rw-r--r-- | app/controllers/projects/group_links_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb index 9eaf26a0dbf..4296283cd64 100644 --- a/app/controllers/projects/group_links_controller.rb +++ b/app/controllers/projects/group_links_controller.rb @@ -4,10 +4,7 @@ class Projects::GroupLinksController < Projects::ApplicationController before_action :authorize_admin_project_member!, only: [:update] def index - @group_links = project.project_group_links.all - - @skip_groups = @group_links.pluck(:group_id) - @skip_groups << project.namespace_id unless project.personal? + redirect_to namespace_project_settings_members_path end def create @@ -19,7 +16,7 @@ class Projects::GroupLinksController < Projects::ApplicationController project.project_group_links.create( group: group, group_access: params[:link_group_access], - expires_at: params[:expires_at] + expires_at: params[:expires_at] || params[:expires_at_groups] ) else flash[:alert] = 'Please select a group.' |