Skip to content
Snippets Groups Projects
  1. Mar 23, 2020
  2. Sep 13, 2019
  3. Aug 31, 2019
  4. Sep 17, 2018
  5. Aug 07, 2018
  6. Jul 17, 2018
  7. Jul 11, 2018
  8. Jun 06, 2018
  9. Feb 22, 2018
  10. Nov 24, 2017
  11. Apr 07, 2017
  12. Apr 04, 2017
  13. Apr 03, 2017
  14. Mar 31, 2017
  15. Nov 29, 2016
  16. Oct 24, 2016
    • Timothy Andrew's avatar
      Implement review comments from @DouweM. · b803bc7b
      Timothy Andrew authored
      b803bc7b
    • Timothy Andrew's avatar
      Fix branch protection API. · f79f3a1d
      Timothy Andrew authored
      1. Previously, we were not removing existing access levels before
         creating new ones. This is not a problem for EE, but _is_ for CE,
         since we restrict the number of access levels in CE to 1.
      
      2. The correct approach is:
      
          CE -> delete all access levels before updating a protected branch
          EE -> delete developer access levels if "developers_can_{merge,push}" is switched off
      
      3. The dispatch is performed by checking if a "length: 1" validation is
         present on the access levels or not.
      
      4. Another source of problems was that we didn't put multiple queries in
         a transaction. If the `destroy_all` passes, but the `update` fails,
         we should have a rollback.
      
      5. Modifying the API to provide users direct access to CRUD access
         levels will make things a lot simpler.
      
      6. Create `create/update` services separately for this API, which
         perform the necessary data translation, before calling the regular
         `create/update` services. The translation code was getting too large
         for the API endpoint itself, so this move makes sense.
      f79f3a1d
  17. Aug 16, 2016
    • Timothy Andrew's avatar
      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
Loading