root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
109,725 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

107 Commits

Author SHA1 Message Date
Phil Hughes 50288a6ace Removed code from project members controller 
This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
 2016-10-20 11:35:29 +01:00
Phil Hughes 6865c46c66 Changed how collections are rendered 
Used variables in haml for replicated checks
Fixed broken conflict
 2016-10-06 15:41:00 +01:00
Phil Hughes 996e802415 Merge branch 'master' into members-ui 2016-10-06 15:30:34 +01:00
Phil Hughes a0eaff1412 Updated Ruby variable name 
Fixed Ruby code based on review feedback
 2016-10-05 14:37:03 +01:00
Phil Hughes c2602aaff3 Updated Ruby 2016-10-04 14:40:03 +01:00
Phil Hughes 2a6942abef Merge branch 'master' into members-ui 2016-10-04 11:03:07 +01:00
Rémy Coutable c8b1311934 Fix a few things after the initial improvment to Members::DestroyService 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-10-03 16:57:48 +02:00
Rémy Coutable 3158f57dba Improve Members::DestroyService 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-10-03 16:57:48 +02:00
Rémy Coutable 924a6b7d33 New AccessRequestsFinder 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-09-28 08:46:59 +02:00
Phil Hughes aac80d76c2 Group links search test fix 2016-09-13 08:44:59 +01:00
Phil Hughes b61cd8a393 Added back ordering 2016-09-13 08:44:59 +01:00
Phil Hughes 7cca8ffe60 Ruby update 2016-09-13 08:44:59 +01:00
Phil Hughes 2abbb0980f Removed group members from the list for now 2016-09-13 08:44:59 +01:00
Phil Hughes 401b797671 Fixed bug when group_ids not present when creating 2016-09-13 08:44:59 +01:00
Phil Hughes 2b41db9215 Search project groups 2016-09-13 08:44:59 +01:00
Phil Hughes 2c3fa33ca2 Updated some specs 
Fixed issue with group name not showing
 2016-09-13 08:44:59 +01:00
Phil Hughes 931d09f481 Fixed search 2016-09-13 08:44:59 +01:00
Phil Hughes 3e19f1976f Fixed issue with invited users not showing up 2016-09-13 08:44:59 +01:00
Phil Hughes cdc55db345 Fixed members error 2016-09-13 08:44:59 +01:00
Phil Hughes e477ad4456 Removes row from dom when deleting 
Fixed spacing with buttons
Disables group form when user doesnt have correct permissions
 2016-09-13 08:44:59 +01:00
Phil Hughes e33cda96cb Fixed group members not deleting 
Combine both group members & project members in project members list
 2016-09-13 08:44:59 +01:00
Phil Hughes 23993147fb Fixed issue with groups not displaying 2016-09-13 08:44:59 +01:00
Phil Hughes 4afd17b278 Included groups on project_members page 2016-09-13 08:44:59 +01:00
Adam Niedzielski f564535579 Allow to edit access expiration date. 2016-08-05 08:36:09 +02:00
Adam Niedzielski b2c8dc6f35 Replace optional parameters with keyword arguments. 2016-08-02 20:37:22 +02:00
Adam Niedzielski 6d92cd3e83 WIP 2016-08-01 20:12:30 +02:00
Rémy Coutable bd78f5733c Exclude requesters from Project#members, Group#members and User#members 
And create new Project#requesters, Group#requesters scopes.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-07-01 17:44:46 +02:00
Rémy Coutable 654565c9dc Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member 
This is a try for a new approach to put the access checks at the service level.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-18 06:06:34 +02:00
Rémy Coutable 6c5b2377f7 Use the new Members::DestroyService in group/project member controllers 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-18 05:46:45 +02:00
Rémy Coutable 515205d3c1 UI and copywriting improvements 
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:18:14 +02:00
Rémy Coutable d71fbe0dbd Factorize #request_access and #approve_access_request into a new AccessRequestActions controller concern 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
Rémy Coutable d26f81239a Add request access for groups 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
David Alexander 17c22156c5 Initial implementation of user access request to projects 2016-06-14 12:12:02 +02:00
Dmitriy Zaporozhets 253a017b01
Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-18 12:48:23 -05:00
Felipe Artur eb99e5f5c1 Remove unused authorization from controller 2016-04-20 10:57:31 -03:00
Felipe Artur 62f6601c59 Show project members only for members 2016-04-18 17:53:34 -03:00
Grzegorz Bizon bb9c194c23 Respond 404 when unauthorized user imports members 2016-04-05 14:37:06 +02:00
Grzegorz Bizon c52b5c92fb Do not leak project exists when importing members 
When importing members, and user does not have permissions to read
members in a source project, do not leak information about source
project existence. Notifiy user that project has not been found instead.
 2016-04-05 13:55:15 +02:00
Grzegorz Bizon b248ee9381 Check permissions when importing project members 
Closes #14899
 2016-04-05 13:32:28 +02:00
Mehmet Emin İNAÇ 6a0ea605e8 Change deprecated usage of rendering without response body 
`render nothing: true` has been deprecated.
For more information see [pr](https://github.com/rails/rails/pull/20336)
 2016-03-16 03:16:25 +02:00
Dmitriy Zaporozhets e1dffa32db Render project members from shared group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-12 18:02:16 +01:00
Dmitriy Zaporozhets 9dd2674963
Fix only 20 group members showing on project member page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 01:43:57 +01:00
Douwe Maan e3fe3da63d Use project member abilities more extensively 2015-11-17 15:51:40 +01:00
Stan Hu 9bfc531ec6 Redirect to a default path if HTTP_REFERER is not set 
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

Closes https://github.com/gitlabhq/gitlabhq/issues/9731
 2015-10-20 07:45:48 -07:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Nicolas ebe4963871 Move Project Members link from Settings to main menu. 
Addresses #2278.
 2015-06-09 14:45:38 +02:00
Dmitriy Zaporozhets 2afa5fcb52
Add ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 16:23:36 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-20 15:39:37 +02:00
Douwe Maan cb5362e7ce Follow newline guidelines. 2015-04-14 15:16:00 +02:00
Douwe Maan 0013ea5130 Remove duplication between Group and ProjectMember. 2015-04-14 12:41:19 +02:00
Douwe Maan 1b5c483d89 Consistently use "invitation" rather than "invite" in text. 2015-04-14 12:25:16 +02:00
Douwe Maan 453340d449 Let membership invitations be resent. 2015-04-14 12:08:10 +02:00
Douwe Maan 87dd3f215f Let members be invited from Add members pane. 2015-04-14 12:08:10 +02:00
Douwe Maan 90dafe31c4 Only show invited users to people who can admin group. 2015-04-14 12:07:33 +02:00
Douwe Maan cee98f2247 Reference project members by id instead of user_id. 2015-04-14 12:06:43 +02:00
Douwe Maan 2b2bd402dc Track who created a group or project member. 2015-04-14 12:06:42 +02:00
Douwe Maan 31fc73f0a9 Use `project_member` instead of `team_member`. 2015-03-15 13:50:38 +01:00