Commit Graph

61 Commits

Author SHA1 Message Date
GitLab Bot b5e513dbef Add latest changes from gitlab-org/gitlab@master 2022-04-05 09:09:24 +00:00
GitLab Bot 9d20ce8c99 Add latest changes from gitlab-org/gitlab@master 2022-03-07 03:18:52 +00:00
GitLab Bot bf1a77ead7 Add latest changes from gitlab-org/gitlab@master 2022-02-23 06:18:49 +00:00
GitLab Bot 78cfc7cf4a Add latest changes from gitlab-org/gitlab@master 2022-02-15 15:15:04 +00:00
GitLab Bot e7e44c0e4c Add latest changes from gitlab-org/gitlab@master 2022-02-15 09:17:01 +00:00
GitLab Bot 99d074d787 Add latest changes from gitlab-org/gitlab@master 2022-02-15 00:15:45 +00:00
GitLab Bot 91608af1b7 Add latest changes from gitlab-org/gitlab@master 2022-02-14 03:12:20 +00:00
GitLab Bot 498ba9dc41 Add latest changes from gitlab-org/gitlab@master 2021-12-03 00:11:20 +00:00
GitLab Bot 1c27dcaf69 Add latest changes from gitlab-org/gitlab@master 2021-11-24 00:12:33 +00:00
GitLab Bot e5d3d8c323 Add latest changes from gitlab-org/gitlab@master 2021-10-25 12:10:19 +00:00
GitLab Bot 54573816ab Add latest changes from gitlab-org/gitlab@master 2021-09-09 09:11:16 +00:00
GitLab Bot 53ea1228be Add latest changes from gitlab-org/gitlab@master 2021-09-03 12:09:03 +00:00
GitLab Bot 014b832720 Add latest changes from gitlab-org/gitlab@master 2021-07-22 21:09:40 +00:00
GitLab Bot be1b7b709e Add latest changes from gitlab-org/gitlab@master 2021-06-10 15:10:14 +00:00
GitLab Bot 79f98200f8 Add latest changes from gitlab-org/gitlab@master 2021-06-07 15:09:56 +00:00
GitLab Bot 0afd7f1817 Add latest changes from gitlab-org/gitlab@master 2021-05-27 12:10:56 +00:00
GitLab Bot 9bc5f183df Add latest changes from gitlab-org/gitlab@master 2021-04-07 21:09:01 +00:00
GitLab Bot b38fc20ae0 Add latest changes from gitlab-org/gitlab@master 2021-03-23 12:09:33 +00:00
GitLab Bot 215cb09934 Add latest changes from gitlab-org/gitlab@master 2020-11-02 15:08:52 +00:00
GitLab Bot c083f926c5 Add latest changes from gitlab-org/gitlab@master 2020-10-15 21:09:12 +00:00
GitLab Bot 6e91fbf774 Add latest changes from gitlab-org/gitlab@master 2020-10-13 12:08:41 +00:00
GitLab Bot 0b4bb101ea Add latest changes from gitlab-org/gitlab@master 2020-10-01 18:10:20 +00:00
GitLab Bot dff0f3475c Add latest changes from gitlab-org/gitlab@master 2020-09-07 18:08:32 +00:00
GitLab Bot 2d8454515e Add latest changes from gitlab-org/gitlab@master 2020-07-16 15:09:38 +00:00
GitLab Bot 8aab944cc5 Add latest changes from gitlab-org/gitlab@master 2020-07-15 00:09:23 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot 1219a9dce9 Add latest changes from gitlab-org/gitlab@master 2020-04-01 15:07:45 +00:00
GitLab Bot 17ab40ca08 Add latest changes from gitlab-org/gitlab@master 2020-02-26 15:08:56 +00:00
GitLab Bot 3fe9588b1c Add latest changes from gitlab-org/gitlab@master 2019-10-30 15:14:17 +00:00
GitLab Bot abfafe3c57 Add latest changes from gitlab-org/gitlab@master 2019-10-29 00:06:10 +00:00
GitLab Bot 8e45d25f7d Add latest changes from gitlab-org/gitlab@master 2019-10-16 18:08:01 +00:00
GitLab Bot d2ffc30fd5 Add latest changes from gitlab-org/gitlab@master 2019-10-16 12:06:32 +00:00
Heinrich Lee Yu 1ce5bcacdb Remove code related to object hierarchy in MySQL
These are not required because MySQL is not
supported anymore
2019-07-25 15:35:06 +08:00
Jacopo a9827e0e18 Removes duplicated members from api/projects/:id/members/all
When using the members/all api the same user was returned multiple times
when he was a member of the project/group and also of one of the
ancestor groups.
Now the member is returned only once giving priority to the membership
on the project and maintaining the same behaviour of the members UI.
2019-05-27 15:40:56 +02:00
Stan Hu 32ddc3fed6 Allow a member to have an access level equal to parent group
Suppose you have this configuration:

1. Subgroup `hello/world`
2. Subgroup `hello/mergers`.
3. Project `hello/world/my-project` has invited group `hello/world` to
access protected branches.
4. The rule allows the group to merge but no one can push.
5. User `newuser` has Owner access to the parent group `hello`.

Previously, there was no way for the user `newuser` to be added to the
`hello/mergers` group since the validation only allowed a user to be
added at a higher access level.

Since membership in a subgroup confers certain access rights, such as
being able to merge or push code to protected branches, we have to
loosen the validation and allow someone to be added at an equal level
granted by the parent group.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11323
2019-04-30 13:31:51 -07:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11: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
Jacopo 5bab78950d Improve error message when adding invalid user to a project 2018-07-30 18:19:57 +02:00
🙈 jacopo beschi 🙉 046796cc3a Resolve "API endpoint that returns all members, including the inherited membership through ancestor group" 2018-07-25 21:45:42 +00:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Stan Hu 46a6edc731 Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:

https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields

Relates to #42030
2018-01-30 21:46:09 -08:00
Mark Fletcher 062f5b7126 Fix error on empty query for Members API 2018-01-21 16:36:55 +00:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Robert Schilling 915dd57fe2 Add tests for the unmodified header 2017-08-28 17:10:34 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Jacopo ff76adb547 Unnecessary "include WaitForAjax" and "include ApiHelpers"
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
Rémy Coutable bf69e6291d Ensure user has a unique username otherwise `user10` would match `user1`
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-03 18:54:48 +02:00
Robert Schilling 86c58687b2 Return 204 for delete endpoints 2017-02-28 08:32:38 +01:00
Robert Schilling 0394055112 API: Return 400 for all validation erros in the mebers API 2017-02-24 20:13:27 +01:00