BigW Consortium Gitlab
!581 has a lot of changes that would cause merge conflicts if not properly backported to CE. This commit/MR serves as a better foundation for gitlab-org/gitlab-ee!581. = Changes = 1. Move from `has_one {merge,push}_access_level` to `has_many`, with the `length` of the association limited to `1`. This is _effectively_ a `has_one` association, but should cause less conflicts with EE, which is set to `has_many`. This has a number of related changes in the views, specs, and factories. 2. Make `gon` variable loading more consistent (with EE!581) in the `ProtectedBranchesController`. Also use `::` to prefix the `ProtectedBranches` services, because this is required in EE. 3. Extract a `ProtectedBranchAccess` concern from the two access level models. This concern only has a single `humanize` method here, but will have more methods in EE. 4. Add `form_errors` to the protected branches creation form. This is not strictly required for EE compatibility, but was an oversight nonetheless.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
admin | Loading commit data... | |
ci | Loading commit data... | |
concerns | Loading commit data... | |
dashboard | Loading commit data... | |
explore | Loading commit data... | |
groups | Loading commit data... | |
import | Loading commit data... | |
oauth | Loading commit data... | |
profiles | Loading commit data... | |
projects | Loading commit data... | |
sherlock | Loading commit data... | |
abuse_reports_controller.rb | Loading commit data... | |
application_controller.rb | Loading commit data... | |
autocomplete_controller.rb | Loading commit data... | |
confirmations_controller.rb | Loading commit data... | |
dashboard_controller.rb | Loading commit data... | |
emojis_controller.rb | Loading commit data... | |
groups_controller.rb | Loading commit data... | |
health_check_controller.rb | Loading commit data... | |
help_controller.rb | Loading commit data... | |
invites_controller.rb | Loading commit data... | |
jwt_controller.rb | Loading commit data... | |
namespaces_controller.rb | Loading commit data... | |
notification_settings_controller.rb | Loading commit data... | |
omniauth_callbacks_controller.rb | Loading commit data... | |
passwords_controller.rb | Loading commit data... | |
profiles_controller.rb | Loading commit data... | |
projects_controller.rb | Loading commit data... | |
registrations_controller.rb | Loading commit data... | |
root_controller.rb | Loading commit data... | |
search_controller.rb | Loading commit data... | |
sent_notifications_controller.rb | Loading commit data... | |
sessions_controller.rb | Loading commit data... | |
snippets_controller.rb | Loading commit data... | |
uploads_controller.rb | Loading commit data... | |
users_controller.rb | Loading commit data... |