- Mar 26, 2018
-
-
James Edwards-Jones authored
-
- May 31, 2017
-
-
James Edwards-Jones authored
Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
-
- Apr 06, 2017
-
-
James Edwards-Jones authored
Added changelog
-
- Apr 03, 2017
-
-
James Edwards-Jones authored
-
James Edwards-Jones authored
Fixes ProtectedBranches#create flash errors bug due to typo in 'flash[:alert] = @protected_branches.errors'
-
- Mar 06, 2017
-
-
Jose Ivan Vargas Lopez authored
Also fixed naming of a test in the deploy_keys_presenter
-
Jose Ivan Vargas Lopez authored
Added specs for the deploy_keys_presenter and added a new method in the presenter called #key_available? Fixed some minor UX inconsistencies and added a concern to handle redirection
-
Jose Ivan Vargas Lopez authored
Also created changelog and removed redundant code
-
Jose Ivan Vargas Lopez authored
Also modified the render calls to the deploy_keys and protected_branches partials
-
Jose Ivan Vargas Lopez authored
Changed views to partials, created the repository view, created a repository_helper to further aid the creation of variables across different controllers
-
Phil Hughes authored
-
- Jan 26, 2017
-
-
Phil Hughes authored
CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294
-
- Aug 16, 2016
-
-
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.
-
- Jul 29, 2016
-
-
Timothy Andrew authored
1. It makes sense to reuse these constants since we had them duplicated in the previous enum implementation. This also simplifies our `check_access` implementation, because we can use `project.team.max_member_access` directly. 2. Use `accepts_nested_attributes_for` to create push/merge access levels. This was a bit fiddly to set up, but this simplifies our code by quite a large amount. We can even get rid of `ProtectedBranches::BaseService`. 3. Move API handling back into the API (previously in `ProtectedBranches::BaseService#translate_api_params`. 4. The protected branch services now return a `ProtectedBranch` rather than `true/false`. 5. Run `load_protected_branches` on-demand in the `create` action, to prevent it being called unneccessarily. 6. "Masters" is pre-selected as the default option for "Allowed to Push" and "Allowed to Merge". 7. These changes were based on a review from @rymai in !5081.
-
Timothy Andrew authored
1. The model now contains this humanization data, which is the once source of truth. 2. Previously, this was being listed out in the dropdown component as well.
-
Timothy Andrew authored
1. Move to dropdowns instead of checkboxes. One each for "Allowed to Push" and "Allowed to Merge" 2. Refactor the `ProtectedBranches` coffeescript class into `ProtectedBranchesAccessSelect`. 3. Modify the backend to accept the new parameters.
-
Timothy Andrew authored
1. Improve error handling while creating protected branches. 2. Modify coffeescript code so that the "Developers can *" checkboxes send a '1' or '0' even when using AJAX. This lets us keep the backend code simpler. 3. Use services for both creating and updating protected branches. Destruction is taken care of with `dependent: :destroy`
-
- Jul 18, 2016
-
-
Rémy Coutable authored
This reverts commit 530f5158. See !4892. Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
- Jul 13, 2016
-
-
Robert Speicher authored
This reverts commit 9ca633eb, reversing changes made to fb229bbf.
-
Mathias Vestergaard authored
- Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
-
- Jul 07, 2016
-
-
Timothy Andrew authored
1. Modify the component to support a callback for every key press in the filter. We need this so we can update the "Create: <branch_name" label. 2. Modify the component to use `$(<selector>).first().click()` instead of `$(selector)[0].click()`, because the latter is non-standard, and doesn't work in PhantomJS.
-
- Jul 05, 2016
-
-
Timothy Andrew authored
1. Allow entering any branch name for a protected branch. - Either pick from a list of options, or enter it manually - You can enter wildcards. 2. Display branches matching a protected branch. - Add a `ProtectedBranches#show` page that displays the branches matching the given protected branch, or a message if there are no matches. - On the `index` page, display the last commit for an exact match, or the number of matching branches for a wildcard match. - Add an `iid` column to `protected_branches` - this is what we use for the `show` page URL. - On the off chance that this feature is unnecessary, this commit encapsulates it neatly, so it can be removed without affecting anything else. 3. Remove the "Last Commit" column from the list of protected branches. - There's no way to pull these for wildcard protected branches, so it's best left for the `show` page. - Rename the `@Branches` instance variable to `@protected_branches` - Minor styling changes with the "Unprotect" button - floated right like the "Revoke" button for personal access tokens 4. Paginate the list of protected branches. 5. Move the instructions to the left side of the page.
-
- Jun 03, 2016
-
-
James Lopez authored
This reverts commit 3e991230.
-
James Lopez authored
# Conflicts: # app/models/project.rb
-
- Mar 16, 2016
-
-
Mehmet Emin İNAÇ authored
`render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
-
- Dec 15, 2015
-
-
Gabriel Mazetto authored
-
- Apr 20, 2015
-
-
Jeroen van Baarsen authored
Signed-off-by:
Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-
- Feb 14, 2015
-
-
Vinnie Okada authored
Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
-
- Jan 24, 2015
-
-
Dmitriy Zaporozhets authored
-
- Dec 26, 2014
-
-
Marin Jankovski authored
-
Marin Jankovski authored
-
Marin Jankovski authored
-
- Jun 26, 2014
-
-
Dmitriy Zaporozhets authored
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- May 23, 2014
-
-
Dmitriy Zaporozhets authored
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- Dec 25, 2013
-
-
skv authored
-
- Jun 23, 2013
-
-
Dmitriy Zaporozhets authored
-
- Sep 27, 2012
-
-
Cyril authored
-
- Sep 26, 2012
-
-
Robert Speicher authored
-
Cyril authored
-
- Aug 10, 2012
-
-
Robert Speicher authored
Didn't bother with files in db/, config/, or features/
-