Clement Ho 15cdc8bfc8 Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/groups/group_members/index.html.haml		2018-05-11 13:51:58 +00:00
..
filter_members_spec.rb	Add 2FA filter to group members page	2018-05-10 13:02:56 +03:00
leave_group_spec.rb	…
list_members_spec.rb	…
manage_members_spec.rb	Move the #update action from Project/Member controllers to the MembershipActions concern	2018-02-27 16:02:22 +01:00
master_manages_access_requests_spec.rb	Ensure member notifications are sent after the member actual creation/update in the DB	2018-04-26 08:28:05 +02:00
request_access_spec.rb	…
search_members_spec.rb	[skip ci] Convert panel related class names to card	2018-04-10 12:11:34 -05:00
sort_members_spec.rb	…