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 |
---|---|---|
.. | ||
access_requestable.rb | Loading commit data... | |
awardable.rb | Loading commit data... | |
case_sensitivity.rb | Loading commit data... | |
faster_cache_keys.rb | Loading commit data... | |
importable.rb | Loading commit data... | |
internal_id.rb | Loading commit data... | |
issuable.rb | Loading commit data... | |
mentionable.rb | Loading commit data... | |
milestoneish.rb | Loading commit data... | |
note_on_diff.rb | Loading commit data... | |
participable.rb | Loading commit data... | |
protected_branch_access.rb | Loading commit data... | |
referable.rb | Loading commit data... | |
sortable.rb | Loading commit data... | |
spammable.rb | Loading commit data... | |
statuseable.rb | Loading commit data... | |
strip_attribute.rb | Loading commit data... | |
subscribable.rb | Loading commit data... | |
taskable.rb | Loading commit data... | |
token_authenticatable.rb | Loading commit data... |