Skip to content
Snippets Groups Projects

FE for share groups with groups

Merged Imre Farkas requested to merge if-share_groups_with_groups_fe into master
All threads resolved!

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Illya Klymov changed target branch from master to if-share_groups_with_groups_be

    changed target branch from master to if-share_groups_with_groups_be

  • Illya Klymov added 1035 commits

    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

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    • 4be8e672 - Frontend support for sharing group with groups

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    • 253cdb11 - Frontend support for sharing group with groups

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    • 58b35d54 - Frontend support for sharing group with groups

    Compare with previous version

  • Illya Klymov resolved all threads

    resolved all threads

  • Illya Klymov marked the checklist item Changelog entry as completed

    marked the checklist item Changelog entry as completed

  • Illya Klymov changed the description

    changed the description

  • Illya Klymov added 1 commit

    added 1 commit

    • ec0a3411 - Frontend support for sharing group with groups

    Compare with previous version

  • Illya Klymov changed the description

    changed the description

  • assigned to @jeremy

  • Illya Klymov added 1 commit

    added 1 commit

    • 346398d0 - Frontend support for sharing group with groups

    Compare with previous version

  • Illya Klymov changed milestone to %12.5

    changed milestone to %12.5

  • Author Maintainer

    @xanf, BE changes are merged :tada:. We can move forward with this one. :thumbsup:

  • Illya Klymov changed target branch from if-share_groups_with_groups_be to master

    changed target branch from if-share_groups_with_groups_be to master

  • Illya Klymov added 1294 commits

    added 1294 commits

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Illya Klymov unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Illya Klymov
  • Illya Klymov
  • @nolith Could you please do a backend review here?

  • assigned to @nolith

  • assigned to @jboyson

  • Justin Boyson approved this merge request

    approved this merge request

  • Imre Farkas mentioned in merge request !19962 (merged)

    mentioned in merge request !19962 (merged)

  • Alessio Caiazza
  • Alessio Caiazza
  • Alessio Caiazza
  • Illya Klymov added 1 commit

    added 1 commit

    • 96f80ca2 - Apply suggestion to changelogs/unreleased/if-share_groups_with_groups_fe.yml

    Compare with previous version

  • Désirée Chevalier approved this merge request

    approved this merge request

  • Illya Klymov added 1005 commits

    added 1005 commits

    Compare with previous version

  • Illya Klymov marked as a Work In Progress from 0179643c

    marked as a Work In Progress from 0179643c

  • mentioned in issue #36639 (closed)

  • Illya Klymov added 202 commits

    added 202 commits

    Compare with previous version

  • 🤖 GitLab Bot 🤖 changed milestone to %12.6

    changed milestone to %12.6

  • Illya Klymov added 202 commits

    added 202 commits

    Compare with previous version

  • Imre Farkas
  • Imre Farkas added 319 commits

    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

    Compare with previous version

  • Imre Farkas added 1 commit

    added 1 commit

    • a9ab52ac - Add Groups::GroupLinksController#update and #destroy

    Compare with previous version

  • Imre Farkas added 1 commit

    added 1 commit

    • ae782768 - Spec for skip_groups in Groups::GroupMembersController#index

    Compare with previous version

  • Imre Farkas
  • Author Maintainer

    @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 to Groups::GroupLinksController but I noticed eg. Project::GroupLinksController has js 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

  • Alessio Caiazza
  • Alessio Caiazza
    • 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

  • Imre Farkas added 1 commit

    added 1 commit

    • 8131acac - More spec for Group#related_group_ids

    Compare with previous version

  • Imre Farkas added 646 commits

    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

    Compare with previous version

  • Author Maintainer

    Thanks @nolith, updated spec/models/group_spec.rb.

  • Imre Farkas assigned to @nolith and unassigned @ifarkas

    assigned to @nolith and unassigned @ifarkas

  • Illya Klymov changed the description

    changed the description

  • Illya Klymov added 1660 commits

    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

    Compare with previous version

  • @seanarnold, could you please make a backend review?

  • Illya Klymov unmarked as a Work In Progress

    unmarked as a Work In Progress

  • added backend label

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Sean Arnold approved this merge request

    approved this merge request

  • Illya Klymov added 208 commits

    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

    Compare with previous version

  • Natalia Tepluhina approved this merge request

    approved this merge request

    • 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 simplify qa/ review here comes list of differences between master qa pipeline and this branch gitlab-qa pipeline status differences, compared to master

      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
  • Illya Klymov assigned to @tmslvnkc

    assigned to @tmslvnkc

  • Tomislav Nikić approved this merge request

    approved this merge request

  • Tomislav Nikić unassigned @tmslvnkc

    unassigned @tmslvnkc

  • @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

  • assigned to @ifarkas

  • Sanad Liaquat
  • Sanad Liaquat
  • Sanad Liaquat
  • Sanad Liaquat
  • Sanad Liaquat
  • 🤖 GitLab Bot 🤖 changed milestone to %12.7

    changed milestone to %12.7

  • Setting ~"Category:Authentication and Authorization" based on ~"group::access".

  • Gosia Ksionek added 1 commit

    added 1 commit

    • e0274ec8 - Move code from controller to finder

    Compare with previous version

  • Illya Klymov added 1418 commits

    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"

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    • 7fac6d31 - Move code from controller to finder

    Compare with previous version

  • unassigned @ifarkas

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Gosia Ksionek added 1 commit

    added 1 commit

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Illya Klymov added 90 commits

    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

    Compare with previous version

  • Illya Klymov added 1 commit

    added 1 commit

    Compare with previous version

  • Dmytro Zaporozhets (DZ) resolved all threads

    resolved all threads

  • Thanks. LGTM!

  • Dmytro Zaporozhets (DZ) approved this merge request

    approved this merge request

  • Dmytro Zaporozhets (DZ) enabled an automatic merge when the pipeline for 8d1677ce succeeds

    enabled an automatic merge when the pipeline for 8d1677ce succeeds

  • Illya Klymov aborted the automatic merge because source branch was updated

    aborted the automatic merge because source branch was updated

  • Illya Klymov added 66 commits

    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

    Compare with previous version

  • Setting ~"Category:Authentication and Authorization" based on ~"group::access".

  • 🤖 GitLab Bot 🤖 added 1 deleted label

    added 1 deleted label

  • @dzaporozhets, it seems you will need to press Merge manually :) We have failure in gitlab-qa ee:group_saml, which is unrelated to this MR: #55242 (closed) gitlab-qa pipeline passed

    Edited by Illya Klymov
  • Illya Klymov added 83 commits

    added 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

    Compare with previous version

  • Illya Klymov added 81 commits

    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

    Compare with previous version

  • mentioned in commit e5d69077

  • @xanf thanks, LGTM! :rocket:

  • mentioned in issue #197143 (closed)

  • Alex Buijs mentioned in merge request !48084 (merged)

    mentioned in merge request !48084 (merged)

  • Please register or sign in to reply
    Loading