Skip to content

Restrict pushes / merges to a protected branch to specific people

Timothy Andrew requested to merge 674-protected-branch-specific-people into master

Relevant Issues

Screenshots

2016-08-04_16-19-12

Tasks

  • ee#674 !581 (merged) Restrict merges to specific people
    • Implementation
      • Model changes
        • Protected branch has_many access levels
      • Frontend
        • How to add new users / roles?
        • Dropdown should include users
        • Dropdown shouldn't include users / roles that have already been selected
        • Allow removing users / roles
      • Removing a user from the project should remove their access (?)
    • Test/refactor
      • Extract common from {Merge,Push}AccessLevel models
      • Clean up code that's removing users/roles that are already selected
      • AccessLevelController?
      • Fix build
      • Add more tests
    • Non :push_code users can't push even if added to an access level
    • Remove access levels when a user is removed from a project
    • Rebase off EE master instead of the "no one can push" feature branch
      • Fix create for roles
      • Fix update for roles
      • Fix delete
      • Fix create for users
      • Fix update for users
      • Fix defaults
    • Verify
      • API
        • For a developer user
          • When they are granted access specifically to
            • Merge
            • Push
        • For a reporter user
          • When they are granted access specifically to
            • Merge
            • Push
      • Default branch protection
    • CHANGELOG
    • Screenshots
    • Only show :push_code users in the dropdown
    • Send email when user is added/removed from a protected branch
    • Assign to {mini,end}boss
    • Fix build
    • Implement @dbalexandre's review comments
    • EE should add to CE
    • Wait for build to pass
    • Test by hand
    • Assign to endboss
    • Create CE MR to backport changes
    • Implement @douwe's comments
      • access_level#humanize
      • Blank line in _protected_branch.html.haml
      • move stuff into shared partials? (_protected_branch_ee.html.haml)
      • Can we move stuff into shared partials? (_create_protected_branch_ee.html.haml)
      • The CE version has a bunch of extra attributes here, do we need those?
      • We can't indent this section just in EE (protected_branches/show.html.haml)
      • In EE, try not to add stuff to existing views. (protected_branches/show.html.haml)
      • If we're gonna change multiline blocks to single-line blocks, we need to so in CE too. (factory)
      • Split up ProtectedBranches#show
    • Wait for build
    • Implement Douwe's suggestions
    • Add uniqueness validation
    • Wait for @alfredo's UI enhancements
    • Remove show page access controls
    • Add more feature specs
    • Wait for review for @alfredo's work
    • Wait for merge

Merge request reports