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 |
---|---|---|
.. | ||
ci | Loading commit data... | |
concerns | Loading commit data... | |
hooks | Loading commit data... | |
members | Loading commit data... | |
network | Loading commit data... | |
project_services | Loading commit data... | |
protected_branch | Loading commit data... | |
.gitkeep | Loading commit data... | |
ability.rb | Loading commit data... | |
abuse_report.rb | Loading commit data... | |
appearance.rb | Loading commit data... | |
application_setting.rb | Loading commit data... | |
audit_event.rb | Loading commit data... | |
award_emoji.rb | Loading commit data... | |
blob.rb | Loading commit data... | |
broadcast_message.rb | Loading commit data... | |
commit.rb | Loading commit data... | |
commit_range.rb | Loading commit data... | |
commit_status.rb | Loading commit data... | |
compare.rb | Loading commit data... | |
deploy_key.rb | Loading commit data... | |
deploy_keys_project.rb | Loading commit data... | |
deployment.rb | Loading commit data... | |
diff_note.rb | Loading commit data... | |
discussion.rb | Loading commit data... | |
email.rb | Loading commit data... | |
environment.rb | Loading commit data... | |
event.rb | Loading commit data... | |
external_issue.rb | Loading commit data... | |
forked_project_link.rb | Loading commit data... | |
generic_commit_status.rb | Loading commit data... | |
global_label.rb | Loading commit data... | |
global_milestone.rb | Loading commit data... | |
group.rb | Loading commit data... | |
identity.rb | Loading commit data... | |
issue.rb | Loading commit data... | |
key.rb | Loading commit data... | |
label.rb | Loading commit data... | |
label_link.rb | Loading commit data... | |
legacy_diff_note.rb | Loading commit data... | |
lfs_object.rb | Loading commit data... | |
lfs_objects_project.rb | Loading commit data... | |
member.rb | Loading commit data... | |
merge_request.rb | Loading commit data... | |
merge_request_diff.rb | Loading commit data... | |
milestone.rb | Loading commit data... | |
namespace.rb | Loading commit data... | |
note.rb | Loading commit data... | |
notification_setting.rb | Loading commit data... | |
oauth_access_token.rb | Loading commit data... | |
personal_access_token.rb | Loading commit data... | |
personal_snippet.rb | Loading commit data... | |
project.rb | Loading commit data... | |
project_group_link.rb | Loading commit data... | |
project_import_data.rb | Loading commit data... | |
project_snippet.rb | Loading commit data... | |
project_team.rb | Loading commit data... | |
project_wiki.rb | Loading commit data... | |
protected_branch.rb | Loading commit data... | |
release.rb | Loading commit data... | |
repository.rb | Loading commit data... | |
security_event.rb | Loading commit data... | |
sent_notification.rb | Loading commit data... | |
service.rb | Loading commit data... | |
snippet.rb | Loading commit data... | |
spam_log.rb | Loading commit data... | |
subscription.rb | Loading commit data... | |
todo.rb | Loading commit data... | |
tree.rb | Loading commit data... | |
u2f_registration.rb | Loading commit data... | |
user.rb | Loading commit data... | |
user_agent_detail.rb | Loading commit data... | |
users_star_project.rb | Loading commit data... | |
wiki_page.rb | Loading commit data... |