diff options
author | James Lopez <james@gitlab.com> | 2018-12-27 13:42:25 +0000 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2018-12-27 13:42:25 +0000 |
commit | c18b8aa51fadee77040b17f90dda124c57a8a6ce (patch) | |
tree | 574270b1e6d9f987a2c62dd74533be400822d9eb /app/models/project_team.rb | |
parent | 2537ed052eb85cf38be778131d91e0d2b6b103d5 (diff) | |
parent | 0cd507461d3869661d71ead79fc06c7a3a0979e6 (diff) | |
download | gitlab-ce-c18b8aa51fadee77040b17f90dda124c57a8a6ce.tar.gz |
Merge branch 'security-11-5' into 'security-fix/security-group-user-removal-11-5'
# Conflicts:
# app/services/members/destroy_service.rb
Diffstat (limited to 'app/models/project_team.rb')
0 files changed, 0 insertions, 0 deletions