Resolve "Inconsistent location of members page between groups and projects"
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?
-
Changelog entry added, if necessary -
Documentation created/updated -
API support added - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master
(if it does - rebase it please) -
Squashed related commits together
What are the relevant issue numbers?
Closes #29893 (closed)
Merge request reports
Activity
added 750 commits
-
6cab3729...27eab8a4 - 749 commits from branch
master
- 89e0b00d - Merge branch 'master' into '29893-change-menu-locations'
-
6cab3729...27eab8a4 - 749 commits from branch
added 1 commit
- 8ec4b057 - Removed a last line comma that resulted from a merge
assigned to @brodock
@brodock Do you have time to review ? Please recheck the backend controllers as i only reactivated an older route and moved the logic from the current route over to the old one. Thank you
added 1 commit
- c5e92246 - Added Changelog Entry for the Member Menu MR
@brodock Could you please take a look to review it so we are able to get it into 9.4 ? If you have no time please let me know and i will find someone else to review
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
@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.
assigned to @timzallmann
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
Toggle commit list-
c5e92246...f8d400f4 - 3056 commits from branch
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 :
Toggle commit list- fe0e6a67...674f05d2 - 160 commits from branch
@brodock thank you for reviewing, did all the points you mentioned. Rebased + Resolved all conflicts.
Moving it to a maintainer now.
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
- Resolved by Tim Zallmann
- 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:
Group:
So that means saying "Members" instead of "Project members", and using the full width.
This can go in a followup MR by the way.
- Resolved by Tim Zallmann
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
Toggle commit list- 178be5cc...dbb65c13 - 66 commits from branch
mentioned in issue #34815 (moved)
All discussions resolved and all tests are green ... back to you @DouweM
assigned to @DouweM
mentioned in commit 4ccdb83a
mentioned in issue gitlab#10924