Commit Graph
2 Commits
Author SHA1 Message Date
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee
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
2015-11-19 10:33:18 -05:00
Robert Speicher 0ad9fc60ec Enable 2FA for LDAP logins 2015-05-14 14:45:31 -04:00