• Robert Speicher's avatar
    Merge 8-2-stable into 8-2-stable-ee · ed2a8ba6
    Robert Speicher authored
    Conflicts remaining:
    
    - app/controllers/groups/group_members_controller.rb
    - app/controllers/projects/project_members_controller.rb
    - app/models/ability.rb
    - app/models/member.rb
    - app/models/project.rb
    ed2a8ba6
gitlab-ssl 9.3 KB