Skip to content
Snippets Groups Projects
Select Git revision
  • move-gl-dropdown
  • improve-table-pagination-spec
  • move-markdown-preview
  • winh-fix-merge-request-spec
  • master default
  • index-namespaces-lower-name
  • winh-single-karma-test
  • 10-3-stable
  • 36782-replace-team-user-role-with-add_role-user-in-specs
  • winh-modal-internal-state
  • tz-ide-file-icons
  • 38869-milestone-select
  • update-autodevops-template
  • jivl-activate-repo-cookie-preferences
  • qa-add-deploy-key
  • docs-move-article-ldap
  • 40780-choose-file
  • 22643-manual-job-page
  • refactor-cluster-show-page-conservative
  • dm-sidekiq-versioning
  • v10.4.0.pre
  • v10.3.0
  • v10.3.0-rc5
  • v10.3.0-rc4
  • v10.3.0-rc3
  • v10.3.0-rc2
  • v10.2.5
  • v10.3.0-rc1
  • v10.0.7
  • v10.1.5
  • v10.2.4
  • v10.2.3
  • v10.2.2
  • v10.2.1
  • v10.3.0.pre
  • v10.2.0
  • v10.2.0-rc4
  • v10.2.0-rc3
  • v10.1.4
  • v10.2.0-rc2
40 results

protected_branches_controller.rb

Forked from GitLab.org / GitLab FOSS
Source project has a limited visibility.
  • Timothy Andrew's avatar
    e805a647
    Backport changes from gitlab-org/gitlab-ee!581 to CE. · e805a647
    Timothy Andrew authored
    !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.
    e805a647
    History
    Backport changes from gitlab-org/gitlab-ee!581 to CE.
    Timothy Andrew authored
    !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.