-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'expiration-date-on-memberships' into 'master'
Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/javascripts/dispatcher.js 3 additions, 0 deletionsapp/assets/javascripts/dispatcher.js
- app/assets/javascripts/member_expiration_date.js 32 additions, 0 deletionsapp/assets/javascripts/member_expiration_date.js
- app/assets/javascripts/project_members.js 0 additions, 3 deletionsapp/assets/javascripts/project_members.js
- app/assets/stylesheets/pages/projects.scss 26 additions, 0 deletionsapp/assets/stylesheets/pages/projects.scss
- app/controllers/admin/groups_controller.rb 1 addition, 1 deletionapp/controllers/admin/groups_controller.rb
- app/controllers/groups/group_members_controller.rb 7 additions, 2 deletionsapp/controllers/groups/group_members_controller.rb
- app/controllers/projects/group_links_controller.rb 3 additions, 1 deletionapp/controllers/projects/group_links_controller.rb
- app/controllers/projects/project_members_controller.rb 7 additions, 2 deletionsapp/controllers/projects/project_members_controller.rb
- app/models/concerns/expirable.rb 15 additions, 0 deletionsapp/models/concerns/expirable.rb
- app/models/group.rb 15 additions, 9 deletionsapp/models/group.rb
- app/models/member.rb 3 additions, 1 deletionapp/models/member.rb
- app/models/members/project_member.rb 8 additions, 2 deletionsapp/models/members/project_member.rb
- app/models/project.rb 2 additions, 2 deletionsapp/models/project.rb
- app/models/project_group_link.rb 3 additions, 1 deletionapp/models/project_group_link.rb
- app/models/project_team.rb 7 additions, 6 deletionsapp/models/project_team.rb
- app/services/members/authorized_destroy_service.rb 19 additions, 0 deletionsapp/services/members/authorized_destroy_service.rb
- app/services/members/destroy_service.rb 1 addition, 6 deletionsapp/services/members/destroy_service.rb
- app/views/groups/group_members/_new_group_member.html.haml 9 additions, 0 deletionsapp/views/groups/group_members/_new_group_member.html.haml
- app/views/groups/group_members/update.js.haml 1 addition, 0 deletionsapp/views/groups/group_members/update.js.haml
Loading
Please register or sign in to comment