• Grzegorz Bizon's avatar
    Merge branch 'master' into rubocop/enable-access-modifiers-cops · 11efddf5
    Grzegorz Bizon authored
    * master: (3075 commits)
      Fix rubocop spec.
      Implement final review comments from @rymai.
      Use `Gitlab::Access` to protected branch access levels.
      Fix `git_push_service_spec`
      Authorize user before creating/updating a protected branch.
      Have the `branches` API work with the new protected branches data model.
      Implement review comments from @axil.
      Remove duplicate specs from `git_access_spec`
      Implement review comments from @dbalexandre.
      Favor labels like `Allowed to push` over `Allowed To Push`.
      Add changelog entry.
      Admins count as masters too.
      Make specs compatible with PhantomJS versions < 2.
      Humanize protected branches' access levels at one location.
      Fix all specs related to changes in !5081.
      Fix default branch protection.
      Update protected branches spec to work with the `select`s.
      Allow setting "Allowed To Push/Merge" while creating a protected branch.
      Enforce "No One Can Push" during git operations.
      Add "No One Can Push" to the protected branches UI.
      ...
    
    Conflicts:
    	app/services/system_note_service.rb
    11efddf5
.rubocop.yml 19 KB