Skip to content
Snippets Groups Projects

Resolve "Inconsistent location of members page between groups and projects"

Merged Tim Zallmann requested to merge 29893-change-menu-locations into master
All threads resolved!

What does this MR do?

It moves the project members page from the settings to the main project menu. For that i reactivated an already

Are there points in the code the reviewer needs to double check?

Backend Controller needs to be rechecked, haven't rewritten anything but moved controller code from the settings route over to the already existing project_members route

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #29893 (closed)

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
  • @timzallmann I just had some very minor remarks above, the code seems to be well covered in specs. I've tried to execute locally but there are conflicts and as I was with master already updated I was getting:

    undefined local variable or method `authorized_projects_populated' for #<User:0x007fcd9aa50590>

    which I believe is unrelated to the MR.

    Please solve the conflicts and assign a maintainer for final considerations. :ok_hand:

  • Tim Zallmann added 3065 commits

    added 3065 commits

    • c5e92246...f8d400f4 - 3056 commits from branch master
    • 20a464c7 - Add Members Menu Item to top project menu
    • ab2ee4c3 - Add Members to Top Project Menu
    • 054e3576 - Fixed Controller Linting Problems
    • 183c1e91 - Changed Test to test for a members main tab and not under settings
    • ac97b57f - Fixed Tests for checking the redirects
    • f1977211 - Fixed Rourting checks on the projectmembers path tests
    • c143b631 - Fix for active tab Members test
    • 66eb187e - Removed a last line comma that resulted from a merge
    • 94740bfe - Added Changelog Entry for the Member Menu MR

    Compare with previous version

  • Tim Zallmann added 169 commits

    added 169 commits

    • fe0e6a67...674f05d2 - 160 commits from branch master
    • 57514651 - Add Members Menu Item to top project menu
    • 09505a1f - Add Members to Top Project Menu
    • 4c1c9864 - Fixed Controller Linting Problems
    • 1e45c492 - Changed Test to test for a members main tab and not under settings
    • ba3771e3 - Fixed Tests for checking the redirects
    • 8d8030c9 - Fixed Rourting checks on the projectmembers path tests
    • e1d35b76 - Fix for active tab Members test
    • a8ebe255 - Added Changelog Entry for the Member Menu MR
    • 91f5b7af - Fixed code based on MR comments :

    Compare with previous version

  • Tim Zallmann resolved all discussions

    resolved all discussions

  • Author Maintainer

    @brodock thank you for reviewing, did all the points you mentioned. Rebased + Resolved all conflicts.

    Moving it to a maintainer now.

  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
    • Resolved by Tim Zallmann

      The project members page needs a page title:

      diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
      index fa99610c0b..e34007f3ef 100644
      --- a/app/views/projects/project_members/index.html.haml
      +++ b/app/views/projects/project_members/index.html.haml
      @@ -1,3 +1,5 @@
      +- page_title "Members"
      +
       .row.prepend-top-default
         .col-lg-4.settings-sidebar
           %h4.prepend-top-0
      
    • Resolved by Tim Zallmann

      @timzallmann Would it be hard to get the layout of the project members page to be more like the group member page?

      Project:

      Screen_Shot_2017-07-06_at_16.58.33

      Group:

      Screen_Shot_2017-07-06_at_16.58.33

      So that means saying "Members" instead of "Project members", and using the full width.

      This can go in a followup MR by the way.

  • Douwe Maan
  • Tim Zallmann added 78 commits

    added 78 commits

    • 178be5cc...dbb65c13 - 66 commits from branch master
    • f5ee463c - Add Members Menu Item to top project menu
    • 417a6f0a - Add Members to Top Project Menu
    • 7a40c683 - Fixed Controller Linting Problems
    • 893c20e7 - Changed Test to test for a members main tab and not under settings
    • 6726d594 - Fixed Tests for checking the redirects
    • 7c37d77a - Fixed Rourting checks on the projectmembers path tests
    • cb072d91 - Fix for active tab Members test
    • 74e9fe45 - Added Changelog Entry for the Member Menu MR
    • 294bcf8c - Fixed code based on MR comments :
    • 15da3e0b - Updated Menu Change with current changes
    • 23e87950 - Fixed Path Names to only Project and not with namespace
    • df78039d - Fixed 2 wrong project namespace attributes

    Compare with previous version

  • Tim Zallmann resolved all discussions

    resolved all discussions

  • mentioned in issue #34815 (moved)

  • Tim Zallmann resolved all discussions

    resolved all discussions

  • Author Maintainer

    All discussions resolved and all tests are green ... back to you @DouweM

  • assigned to @DouweM

  • Douwe Maan approved this merge request

    approved this merge request

  • merged

  • Douwe Maan mentioned in commit 4ccdb83a

    mentioned in commit 4ccdb83a

  • mentioned in issue gitlab#10924

  • Please register or sign in to reply
    Loading