Commit Graph

5 Commits

Author SHA1 Message Date
Alfredo Sumaran 18e98a3643 Do not update if one dropdown has not selected any option
No need to update the branch permission if no option is marked on the dropdown
2016-08-21 00:19:22 -05:00
Timothy Andrew e805a64700 Backport changes from gitlab-org/gitlab-ee!581 to CE.
!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.
2016-08-16 11:05:14 +05:30
Alfredo Sumaran 26c1b72d8f Ensure we are looking for the right dropdown inside the form wrapper 2016-08-05 17:19:01 -05:00
Alfredo Sumaran 8f29c332b5 Wrap classes with IIFE and define it inside gl namespace 2016-08-05 17:19:01 -05:00
Alfredo Sumaran bc5bc7cb9e Fix class names and move each class to its own file 2016-08-05 17:19:01 -05:00