Commit graph

6 commits

Author SHA1 Message Date
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Stan Hu
5aa08c6938 Reconcile CE and EE differences in members/_member.html.haml
This file conflicts quite frequently with any changes in the file.
2019-06-01 22:19:22 -07:00
James Lopez
64c11f104c Resolve "Can add an existing group member into a group project with new permissions but permissions are not overridden" 2018-12-06 13:15:29 +00:00
gfyoung
d5bf57a6af Enable frozen string in presenters and policies
Enable frozen string in:

* app/presenters
* app/policies

Partially addresses #47424.
2018-07-24 13:18:25 -07:00
Rémy Coutable
50d7c356c2
Present member collection at the controller level
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-12 18:14:58 +01:00
TM Lee
2cf3fc18a6 Refactor member view by using presenter
- Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter
- Make Member model Presentable
- Move action_member_permission from MembersHelper into the MemberPresenter
- Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter

Fixes #28004.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-11 18:30:56 +01:00