Resolve "Combine Deploy Keys and Push Rules and Mirror Repository and Protect Branches settings pages"
What does this MR do?
Combines the options in the following way
CE: Protected Branches and Deploy Keys EE: Protected Branches, Deploy Keys, Push Rules and Mirror Repository
Into a single option called Repository
Screenshots (if relevant)
Does this MR meet the acceptance criteria?
-
Changelog entry added -
Documentation created/updated - 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 #26732 (closed)
EE MR
Merge request reports
Activity
@jivanvl Regarding using presenters, you can start here: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/presenters/README.md and then ask further questions to @grzesiek (since I think he's going to assist you on this MR?).
added 372 commits
-
1ca35d3a...4468104f - 369 commits from branch
master
- 77a086bd - Added repository controller and route for the settings namespace
- 5fc85e96 - Created the gear settings entry and created a way to initialize both sections with one controller
- 7c309587 - Fixed tests, changed dispatcher routing to the 'repository:show'
Toggle commit list-
1ca35d3a...4468104f - 369 commits from branch
assigned to @jivanvl
added 1 commit
- 8c743cf2 - Add proof of concept of deploy keys settings presenter
added 1 commit
- 6edc1d51 - Add access spec tests for the /settings/repository route
added 1046 commits
-
6edc1d51...a6a3df64 - 1041 commits from branch
master
- 28b01912 - Added repository controller and route for the settings namespace
- e33088b3 - Created the gear settings entry and created a way to initialize both sections with one controller
- 18a80fda - Fixed tests, changed dispatcher routing to the 'repository:show'
- b454c013 - Introduced the deploy keys presenter
- 53a6c1a6 - Add access spec tests for the /settings/repository route
Toggle commit list-
6edc1d51...a6a3df64 - 1041 commits from branch
marked the task Changelog entry added as completed
added 129 commits
-
53a6c1a6...4a925837 - 123 commits from branch
master
- f35f1031 - Added repository controller and route for the settings namespace
- 0f743a7b - Created the gear settings entry and created a way to initialize both sections with one controller
- 99469160 - Fixed tests, changed dispatcher routing to the 'repository:show'
- a414f1cb - Introduced the deploy keys presenter
- 758c97be - Add access spec tests for the /settings/repository route
- 4878c207 - Added access spec tests
Toggle commit list-
53a6c1a6...4a925837 - 123 commits from branch
marked the task Squashed related commits together as completed
marked the task Conform by the style guides as completed
marked the task Conform by the merge request performance guides as completed
@mikegreiling can you review this when you get a chance? Thanks!
assigned to @mikegreiling
@mikegreiling do you think you'll have time to review this today/soon? @jivanvl has a backend dev already reviewed it?
@annabeldunstone unfortunately no
Ah okay. Nevermind @mikegreiling then! @felipe_artur could you please review the backend changes here?
Edited by Annabel Dunstone Grayassigned to @adamniedzielski
assigned to @felipe_artur
mentioned in issue #28366 (closed)
@jivanvl can you remove references to
page_title
fromapp/views/projects/protected_branches/_index.html.haml
?- page_title "Protected branches"
and
.col-lg-3 %h4.prepend-top-0 = page_title
added 675 commits
-
4878c207...12cd4c83 - 669 commits from branch
master
- 2e8d1dc4 - Added repository controller and route for the settings namespace
- ad5ce970 - Created the gear settings entry and created a way to initialize both sections with one controller
- cadbb691 - Fixed tests, changed dispatcher routing to the 'repository:show'
- 50163bcd - Introduced the deploy keys presenter
- cac812ed - Add access spec tests for the /settings/repository route
- eca16271 - Added access spec tests
Toggle commit list-
4878c207...12cd4c83 - 669 commits from branch
@mikegreiling Improved the MR based on your comments
I'd say we can change the text to something else, perhaps change it to just 'Create one with the form above'What do you think @tauriedavis?
Edited by Jose Ivan Vargas- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
Great merge request @jivanvl Thank you!
I added some small comments.- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
- Resolved by Jose Ivan Vargas
@jivanvl Awesome work!
I also left a couple of notes.I'd say we can change the text to something else, perhaps change it to just 'Create one with the form above'
@jivanvl That sounds good to me, thanks!