FE for share groups with groups
What does this MR do?
Screenshots
Does this MR meet the acceptance criteria?
Conformity
- [-] Changelog entry
- [-] Documentation created/updated or follow-up review issue created
-
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides - [-] Separation of EE specific content
Performance and Testing
Merge request reports
Activity
changed milestone to %12.4
removed database databasereview pending labels
added database databasereview pending labels
6 Warnings This merge request is quite big (more than 617 lines changed), please consider splitting it into multiple merge requests. This merge request changed files with disabled eslint rules. Please consider fixing them. 474fc2bb: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. 02123136: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. 767d72ac: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. 8c137b58: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. 1 Message CHANGELOG missing: If this merge request doesn’t need a CHANGELOG entry, feel free to ignore this message. You can create one with:
bin/changelog -m 17139 "FE for share groups with groups"
If you want to create a changelog entry for GitLab EE, run the following instead:
bin/changelog --ee -m 17139 "FE for share groups with groups"
Note: Merge requests with ~backstage, ci-build, meta do not trigger this check.
Disabled eslint rules
The following files have disabled
eslint
rules. Please consider fixing them:app/assets/javascripts/pages/groups/group_members/index/index.js
Run the following command for more details
node_modules/.bin/eslint --report-unused-disable-directives --no-inline-config \ 'app/assets/javascripts/pages/groups/group_members/index/index.js'
Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has randomly picked a candidate for each review slot. Feel free to override this selection if you think someone else would be better-suited, or the chosen person is unavailable.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not (yet?) automatically notify them for you.
Category Reviewer Maintainer frontend Dennis Tang ( @dennis
)Natalia Tepluhina ( @ntepluhina
)backend Ethan Urie ( @eurie
)Peter Leitzen ( @splattael
)test Quality for spec/features/*
Désirée Chevalier ( @dchevalier2
)No maintainer available QA Zeff Morgan ( @zeffmorgan
)Walmyr Lima e Silva Filho ( @wlsf82
)Generated by
DangerEdited by 🤖 GitLab Bot 🤖added 1225 commits
-
1da1ebbd...1ea8d32d - 1223 commits from branch
master
- ad476338 - Share groups with groups (BE)
- 7a4ce8a6 - FE for share groups with groups
-
1da1ebbd...1ea8d32d - 1223 commits from branch
added 112 commits
-
7a4ce8a6...56987a07 - 110 commits from branch
master
- fdac0fde - Share groups with groups (BE)
- 646b0ba9 - FE for share groups with groups
-
7a4ce8a6...56987a07 - 110 commits from branch
added 192 commits
-
b525ca9a...f10ee617 - 190 commits from branch
master
- 1435c459 - Share groups with groups (BE)
- 9fc45d88 - FE for share groups with groups
-
b525ca9a...f10ee617 - 190 commits from branch
mentioned in issue #22986 (closed)
assigned to @xanf
mentioned in merge request !17117 (merged)
mentioned in issue #34388 (closed)
added missed:12.4 label
added 515 commits
-
9fc45d88...78e2ab01 - 512 commits from branch
master
- 13c3961e - Share groups with groups (BE)
- 6e2d9df3 - Fix BE review
- 54bfb78a - WIP: Share groups with groups FE
Toggle commit list-
9fc45d88...78e2ab01 - 512 commits from branch
marked as a Work In Progress from 54bfb78a
removed database databasereview pending labels
added database databasereview pending labels
- Resolved by Illya Klymov
removed database databasereview pending labels
added 1035 commits
-
54bfb78a...a4ea6054 - 1033 commits from branch
if-share_groups_with_groups_be
- 1e548262 - WIP: Share groups with groups FE
- 67854b20 - Frontend support for sharing group with groups
-
54bfb78a...a4ea6054 - 1033 commits from branch
added 1 commit
- 4be8e672 - Frontend support for sharing group with groups
added 1 commit
- 253cdb11 - Frontend support for sharing group with groups
added 1 commit
- 58b35d54 - Frontend support for sharing group with groups
marked the checklist item Changelog entry as completed
added 1 commit
- ec0a3411 - Frontend support for sharing group with groups
- Resolved by Illya Klymov
@jeremy, as a part of unifying groups/members Invitation interface 'Invite member' tab action button was renamed from
Add to project
toInvite
. Let me know, that this change is ok
assigned to @jeremy
added 1 commit
- 346398d0 - Frontend support for sharing group with groups
changed milestone to %12.5
@xanf, BE changes are merged
. We can move forward with this one.added 1294 commits
-
346398d0...a640e526 - 1293 commits from branch
master
- b9aeb218 - WIP: add frontend support
-
346398d0...a640e526 - 1293 commits from branch
- Resolved by Natalia Tepluhina
- Resolved by Natalia Tepluhina
- Resolved by Illya Klymov
@zeffmorgan could you give me a hand with QA review here please? It seems that
gitlab-qa
downstream failures are not related to my changes
assigned to @zeffmorgan
@nolith Could you please do a backend review here?
assigned to @nolith
- Resolved by Illya Klymov
@jboyson Could you please do a frontend review?
assigned to @jboyson
- Resolved by Illya Klymov
@dchevalier2 could you please take a look at my changes for specs?
assigned to @dchevalier2
unassigned @jboyson
mentioned in merge request !19962 (merged)
mentioned in merge request gitlab-com/www-gitlab-com!34501 (closed)
assigned to @kushalpandya
- Resolved by Imre Farkas
- Resolved by Imre Farkas
- Resolved by Illya Klymov
- Resolved by Alessio Caiazza
- Resolved by Imre Farkas
- Resolved by Illya Klymov
unassigned @kushalpandya
- Resolved by Illya Klymov
unassigned @nolith
mentioned in issue gitlab-com/www-gitlab-com#5356 (closed)
added 1 commit
- 96f80ca2 - Apply suggestion to changelogs/unreleased/if-share_groups_with_groups_fe.yml
unassigned @dchevalier2
unassigned @zeffmorgan
unassigned @jeremy
added 1005 commits
-
96f80ca2...cb39aebc - 1004 commits from branch
master
- 0179643c - WIP: add frontend support
-
96f80ca2...cb39aebc - 1004 commits from branch
marked as a Work In Progress from 0179643c
added missed:12.5 label
mentioned in issue #36639 (closed)
added 202 commits
-
0179643c...6318b5d9 - 201 commits from branch
master
- aae6622b - Add frontend support for sharing groups with groups
-
0179643c...6318b5d9 - 201 commits from branch
changed milestone to %12.6
added 202 commits
-
aae6622b...a0412c79 - 201 commits from branch
master
- 9be3f14a - Add frontend support for sharing groups with groups
-
aae6622b...a0412c79 - 201 commits from branch
- Resolved by Imre Farkas
added 319 commits
-
9be3f14a...4a557819 - 315 commits from branch
master
- 1866eee9 - Add frontend support for sharing groups with groups
- 9e86c4f1 - Avoid disabling CodeReuse/ActiveRecord cop
- e207b541 - Use alias_method for ProjectGroupLink#shared_with_group
- 952e85f0 - Spec for GroupGroupLink#human_access
Toggle commit list-
9be3f14a...4a557819 - 315 commits from branch
added 1 commit
- a9ab52ac - Add Groups::GroupLinksController#update and #destroy
added 1 commit
- ae782768 - Spec for skip_groups in Groups::GroupMembersController#index
- Resolved by Dmytro Zaporozhets (DZ)
@xanf, added the suggestions from BE review (thanks @nolith!)
A few things I noticed:
- the view changes are there even if the feature flag is not enabled
- updating and deleting
GroupGroupLink
didn't work. I added#update
and#destroy
toGroups::GroupLinksController
but I noticed eg.Project::GroupLinksController
hasjs
view rendered in the response, so I left it for you to have whatever is convenient
Let me know if you need further help!
unassigned @ifarkas
- Resolved by Imre Farkas
- Resolved by Imre Farkas
- Resolved by Illya Klymov
@ifarkas I've left some comments, please assign the MR to me next time. It will be easier to find it.
the view changes are there even if the feature flag is not enabled
I didn't notice the feature flag as it's not part of this MR, it's not mentioned in the MR description, and we don't have the feature flag label here.
It looks we have this check in the controller
def check_feature_flag! render_404 unless Feature.enabled?(:share_group_with_group) end
If all these changes are behind the feature flag, then we have to remove the changelog according to What warrants a changelog entry?
assigned to @ifarkas
added 646 commits
-
8131acac...d250c3bc - 639 commits from branch
master
- 78d94c21 - Add frontend support for sharing groups with groups
- 06e867c3 - Avoid disabling CodeReuse/ActiveRecord cop
- e55f3e68 - Use alias_method for ProjectGroupLink#shared_with_group
- a44e46a9 - Spec for GroupGroupLink#human_access
- be4b47c1 - Add Groups::GroupLinksController#update and #destroy
- a4400af0 - Spec for skip_groups in Groups::GroupMembersController#index
- 5142a466 - More spec for Group#related_group_ids
Toggle commit list-
8131acac...d250c3bc - 639 commits from branch
Thanks @nolith, updated
spec/models/group_spec.rb
.unassigned @nolith
added feature flag label
added 1660 commits
-
5142a466...26ccbc3e - 1652 commits from branch
master
- eb525a61 - Add frontend support for sharing groups with groups
- a01ef460 - Avoid disabling CodeReuse/ActiveRecord cop
- bc50d7f6 - Use alias_method for ProjectGroupLink#shared_with_group
- 68c17487 - Spec for GroupGroupLink#human_access
- d01e69c0 - Add Groups::GroupLinksController#update and #destroy
- 36a49d3e - Spec for skip_groups in Groups::GroupMembersController#index
- 18c71645 - More spec for Group#related_group_ids
- 73580ce2 - Add share with group tests
Toggle commit list-
5142a466...26ccbc3e - 1652 commits from branch
@seanarnold, could you please make a backend review?
assigned to @seanarnold
added backend label
- Resolved by Dmytro Zaporozhets (DZ)
unassigned @seanarnold
- Resolved by Natalia Tepluhina
@ntepluhina, it seems you lost in roulette. Could you please make a maintainer review? Happy HAMLing :)
assigned to @ntepluhina
- Resolved by Dmytro Zaporozhets (DZ)
@dzaporozhets, could you please make a maintainer review of this one according to roulette?
assigned to @dzaporozhets
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
unassigned @dzaporozhets
added 208 commits
-
3da7665f...9b6a3362 - 199 commits from branch
master
- cd890a7f - Add frontend support for sharing groups with groups
- 938bc395 - Avoid disabling CodeReuse/ActiveRecord cop
- eb6b4371 - Use alias_method for ProjectGroupLink#shared_with_group
- 39803a4e - Spec for GroupGroupLink#human_access
- 60643869 - Add Groups::GroupLinksController#update and #destroy
- e1c96362 - Spec for skip_groups in Groups::GroupMembersController#index
- 12503f27 - More spec for Group#related_group_ids
- f0e6223a - Add share with group tests
- 463779da - Address reviewer comments
Toggle commit list-
3da7665f...9b6a3362 - 199 commits from branch
unassigned @ntepluhina
- Resolved by Tomislav Nikić
@tmslvnkc, can you look at QA part of this one? Unfortunately it seems that
gitlab-qa
fails for master also, so to simplifyqa/
review here comes list of differences between master qa pipeline and this branchgitlab-qa
pipeline status differences, compared tomaster
Failed Job This branch Master Differences in failures ee:kubernetes
Job Job identical (timed out) ee:docker
Job Job identical ee:update 2/5
Job Job identical ee:update 1/5
Job Job 1 less failure in this branch ee:relative_url 2/5
Job Job identical ee:instance 2/5
Job Job identical ee:relative_url 1/5
Job Job 1 less failure in this branch ee:instance 1/5
Job Job 1 less failure in this branch
@sliaquat could you please look at this as QA maintainer
gitlab-qa
pipelines is red, here is comparison with master state - !17139 (comment 261589673)assigned to @sliaquat
unassigned @sliaquat
assigned to @ifarkas
- Resolved by Sanad Liaquat
- Resolved by Sanad Liaquat
- Resolved by Sanad Liaquat
- Resolved by Sanad Liaquat
- Resolved by Sanad Liaquat
changed milestone to %12.7
added missed:12.6 label
added missed-deliverable label
added 1418 commits
-
e0274ec8...a82c4514 - 1407 commits from branch
master
- cdb5b62e - Add frontend support for sharing groups with groups
- a86b0e86 - Avoid disabling CodeReuse/ActiveRecord cop
- a5952170 - Use alias_method for ProjectGroupLink#shared_with_group
- 84178f50 - Spec for GroupGroupLink#human_access
- 02733c98 - Add Groups::GroupLinksController#update and #destroy
- de1a259d - Spec for skip_groups in Groups::GroupMembersController#index
- c627665a - More spec for Group#related_group_ids
- 4d360d07 - Add share with group tests
- 5b9270a4 - Address reviewer comments
- c3d646fb - Move code from controller to finder
- 411ea360 - Revert "Move code from controller to finder"
Toggle commit list-
e0274ec8...a82c4514 - 1407 commits from branch
- Resolved by Dmytro Zaporozhets (DZ)
@dzaporozhets, could you please review this one, addressed your suggestions, and if it's ok - merge :)
unassigned @ifarkas
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
- Resolved by Dmytro Zaporozhets (DZ)
added 90 commits
-
f2a2e305...f1fa312f - 81 commits from branch
master
- 05b444e4 - Add frontend support for sharing groups with groups
- 351f293e - Avoid disabling CodeReuse/ActiveRecord cop
- f90e3641 - Use alias_method for ProjectGroupLink#shared_with_group
- 18280d9b - Spec for GroupGroupLink#human_access
- e9a5c61a - Add Groups::GroupLinksController#update and #destroy
- 75b7e989 - Spec for skip_groups in Groups::GroupMembersController#index
- 87dcc422 - More spec for Group#related_group_ids
- 7231d8c7 - Add share with group tests
- 97b23e60 - Address reviewer comments
Toggle commit list-
f2a2e305...f1fa312f - 81 commits from branch
assigned to @dzaporozhets
- Resolved by Dmytro Zaporozhets (DZ)
enabled an automatic merge when the pipeline for 8d1677ce succeeds
added 66 commits
-
8d1677ce...6bc0f1f7 - 57 commits from branch
master
- 06c4d954 - Add frontend support for sharing groups with groups
- 23e29478 - Avoid disabling CodeReuse/ActiveRecord cop
- d79dba8e - Use alias_method for ProjectGroupLink#shared_with_group
- 01c9be4b - Spec for GroupGroupLink#human_access
- b35e1094 - Add Groups::GroupLinksController#update and #destroy
- 06370757 - Spec for skip_groups in Groups::GroupMembersController#index
- 16ec3ef1 - More spec for Group#related_group_ids
- 48b4196e - Add share with group tests
- 318d6a43 - Address reviewer comments
Toggle commit list-
8d1677ce...6bc0f1f7 - 57 commits from branch
@dzaporozhets, it seems you will need to press Merge manually :)
We have failure ingitlab-qa pipeline passedgitlab-qa
ee:group_saml
, which is unrelated to this MR: #55242 (closed)Edited by Illya Klymovadded 83 commits
-
318d6a43...eb64d772 - 74 commits from branch
master
- 125b7a6e - Add frontend support for sharing groups with groups
- 9917d97a - Avoid disabling CodeReuse/ActiveRecord cop
- 3d8efad4 - Use alias_method for ProjectGroupLink#shared_with_group
- 3d793d2f - Spec for GroupGroupLink#human_access
- 84d34009 - Add Groups::GroupLinksController#update and #destroy
- f10d8d41 - Spec for skip_groups in Groups::GroupMembersController#index
- 80a13c83 - More spec for Group#related_group_ids
- c985ba75 - Add share with group tests
- e01b527b - Address reviewer comments
Toggle commit list-
318d6a43...eb64d772 - 74 commits from branch
added 81 commits
-
e01b527b...2d717f74 - 72 commits from branch
master
- 8c137b58 - Add frontend support for sharing groups with groups
- 6f0bbf9f - Avoid disabling CodeReuse/ActiveRecord cop
- 767d72ac - Use alias_method for ProjectGroupLink#shared_with_group
- 3e25cad9 - Spec for GroupGroupLink#human_access
- 02123136 - Add Groups::GroupLinksController#update and #destroy
- 474fc2bb - Spec for skip_groups in Groups::GroupMembersController#index
- 0821b345 - More spec for Group#related_group_ids
- 0b70fe77 - Add share with group tests
- 08f6352d - Address reviewer comments
Toggle commit list-
e01b527b...2d717f74 - 72 commits from branch
The
package-and-qa
job from pipeline https://gitlab.com/gitlab-org/gitlab/pipelines/108435489 triggered https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/pipelines/108442547 downstream.The
Trigger:qa-test
job from pipeline https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/pipelines/108442547 triggered https://gitlab.com/gitlab-org/gitlab-qa/pipelines/108456532 downstream.The
gitlab-qa
downstream pipeline passed. .
mentioned in commit e5d69077
@xanf thanks, LGTM!
mentioned in issue #197143 (closed)
mentioned in merge request !48084 (merged)