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 |
---|---|---|
.. | ||
application_controller.rb | Loading commit data... | |
artifacts_controller.rb | Loading commit data... | |
avatars_controller.rb | Loading commit data... | |
badges_controller.rb | Loading commit data... | |
blame_controller.rb | Loading commit data... | |
blob_controller.rb | Loading commit data... | |
branches_controller.rb | Loading commit data... | |
builds_controller.rb | Loading commit data... | |
commit_controller.rb | Loading commit data... | |
commits_controller.rb | Loading commit data... | |
compare_controller.rb | Loading commit data... | |
container_registry_controller.rb | Loading commit data... | |
deploy_keys_controller.rb | Loading commit data... | |
environments_controller.rb | Loading commit data... | |
find_file_controller.rb | Loading commit data... | |
forks_controller.rb | Loading commit data... | |
git_http_client_controller.rb | Loading commit data... | |
git_http_controller.rb | Loading commit data... | |
graphs_controller.rb | Loading commit data... | |
group_links_controller.rb | Loading commit data... | |
hooks_controller.rb | Loading commit data... | |
imports_controller.rb | Loading commit data... | |
issues_controller.rb | Loading commit data... | |
labels_controller.rb | Loading commit data... | |
lfs_api_controller.rb | Loading commit data... | |
lfs_storage_controller.rb | Loading commit data... | |
merge_requests_controller.rb | Loading commit data... | |
milestones_controller.rb | Loading commit data... | |
network_controller.rb | Loading commit data... | |
notes_controller.rb | Loading commit data... | |
pipelines_controller.rb | Loading commit data... | |
pipelines_settings_controller.rb | Loading commit data... | |
project_members_controller.rb | Loading commit data... | |
protected_branches_controller.rb | Loading commit data... | |
raw_controller.rb | Loading commit data... | |
refs_controller.rb | Loading commit data... | |
releases_controller.rb | Loading commit data... | |
repositories_controller.rb | Loading commit data... | |
runner_projects_controller.rb | Loading commit data... | |
runners_controller.rb | Loading commit data... | |
services_controller.rb | Loading commit data... | |
snippets_controller.rb | Loading commit data... | |
tags_controller.rb | Loading commit data... | |
todos_controller.rb | Loading commit data... | |
tree_controller.rb | Loading commit data... | |
triggers_controller.rb | Loading commit data... | |
uploads_controller.rb | Loading commit data... | |
variables_controller.rb | Loading commit data... | |
wikis_controller.rb | Loading commit data... |