An error occurred fetching the project authors.
- 06 Apr, 2017 1 commit
-
-
Eric Eastwood authored
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27262 Conflicts: app/assets/javascripts/filtered_search/filtered_search_manager.js app/views/shared/issuable/_search_bar.html.haml
-
- 28 Nov, 2016 1 commit
-
-
David Wagner authored
Make sort and filter dropdowns look the same and tweak their icon and colors according to #24150. Signed-off-by:
David Wagner <david@marvid.fr>
-
- 03 Nov, 2016 1 commit
-
-
Annabel Dunstone Gray authored
-
- 20 Aug, 2016 3 commits
-
-
Douwe Maan authored
Restrict pushes / merges to a protected branch to specific people - Closes #674 - Related to #179 ![2016-08-04_16-19-12](/uploads/c81032fe262949f3084974c4e622e9eb/2016-08-04_16-19-12.png) ![](https://gitlab.com/gitlab-org/gitlab-ee/uploads/342f06078b07b39c2c817b12c81b30fe/Screen_Shot_2016-07-27_at_6.50.56_PM.png) ![](https://gitlab.com/gitlab-org/gitlab-ee/uploads/52fe1ae3027d491270ea4845ae7ce54b/Screen_Shot_2016-07-27_at_6.51.02_PM.png) - [ ] ee#674 !581 Restrict merges to specific people - [x] Implementation - [x] Model changes - [x] Protected branch `has_many` access levels - [x] Frontend - [x] How to add new users / roles? - [x] Dropdown should include users - [x] Dropdown shouldn't include users / roles that have already been selected - [x] Allow removing users / roles - [x] Removing a user from the project should remove their access (?) - [x] Test/refactor - [x] Extract common from {Merge,Push}AccessLevel models - [x] Clean up code that's removing users/roles that are already selected - [x] AccessLevelController? - [x] Fix build - [x] Add more tests - [x] Non `:push_code` users can't push even if added to an access level - [x] Remove access levels when a user is removed from a project - [x] Rebase off EE master instead of the "no one can push" feature branch - [x] Fix create for roles - [x] Fix update for roles - [x] Fix delete - [x] Fix create for users - [x] Fix update for users - [x] Fix defaults - [x] Verify - [x] API - [x] For a developer user - [x] When they are granted access specifically to - [x] Merge - [x] Push - [x] For a reporter user - [x] When they are granted access specifically to - [x] Merge - [x] Push - [x] Default branch protection - [x] CHANGELOG - [x] Screenshots - [x] Only show `:push_code` users in the dropdown - [x] Send email when user is added/removed from a protected branch - [x] Assign to {mini,end}boss - [x] Fix build - [x] Implement @dbalexandre's review comments - [x] EE should _add_ to CE - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ee/commit/61edf43d31452a0b972dc880e277c825d59f764f/builds) to pass - [x] Test by hand - [x] Assign to endboss - [x] Create CE MR to backport changes - [x] Implement @Douwe's comments - [x] access_level#humanize - [x] Blank line in _protected_branch.html.haml - [x] move stuff into shared partials? (_protected_branch_ee.html.haml) - [x] Can we move stuff into shared partials? (_create_protected_branch_ee.html.haml) - [x] The CE version has a bunch of extra attributes here, do we need those? - [x] We can't indent this section just in EE (protected_branches/show.html.haml) - [x] In EE, try not to add stuff to existing views. (protected_branches/show.html.haml) - [x] If we're gonna change multiline blocks to single-line blocks, we need to so in CE too. (factory) - [x] Split up `ProtectedBranches#show` - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ee/commit/3943254d5f92c9be520f685044d23bf75282d42a/builds) - [x] Implement Douwe's suggestions - [x] Add uniqueness validation - [x] Wait for @alfredo's UI enhancements - [x] Remove `show` page access controls - [x] Add more feature specs - [ ] Wait for review for @alfredo's work - [ ] Wait for merge See merge request !581
-
Timothy Andrew authored
1. No need to change the spec for `UserAccess#can_push_to_branch?` for EE anymore. 2. Make the `dropdowns_helper` change additive to CE, so as to reduce the potential for merge conflicts.
-
Timothy Andrew authored
1. While creating a protected branch, you can set a single user / role for each setting ("Allowed to Merge", "Allowed to Push"). 2. More users / roles can be set subsequently. 3. Repurposed 'users_select.js.coffee` for the needs of this page. 4. Move protected branch settings to the `show` page. - Too many settings on the single index page can be overwhelming. Also, if the number of users that can access a protected branch is large, the amount of space between protected branches in the table can be unwieldy. - This is the simplest design I can think of - we can use this until we have someone from the frontend/ux team take a look at this. - Move protected branches javascript under a `protected_branches` directory. - The dropdowns don't show access levels / users that have already been selected. - Allow deleting access levels using two new access level controllers.
-
- 20 Jul, 2016 3 commits
-
-
Phil Hughes authored
Added tests for new merge requests from forked project & owned project
-
Phil Hughes authored
-
Phil Hughes authored
-
- 08 Jul, 2016 1 commit
-
-
Robert Speicher authored
This reverts commit bf2a86b7.
-
- 07 Jul, 2016 3 commits
-
-
Robert Speicher authored
This reverts commit 68155ee7, reversing changes made to 7ebd011e.
-
Alfredo Sumaran authored
# Conflicts: # app/assets/stylesheets/pages/admin.scss # app/views/admin/users/index.html.haml
-
Alfredo Sumaran authored
-
- 28 Jun, 2016 1 commit
-
-
Luke "Jared" Bennett authored
-
- 09 Jun, 2016 1 commit
-
-
Phil Hughes authored
-
- 25 Mar, 2016 1 commit
-
-
Jacob Schatz authored
-
- 23 Mar, 2016 1 commit
-
-
Phil Hughes authored
-
- 18 Mar, 2016 1 commit
-
-
Phil Hughes authored
Fixed other issues based on feedback
-
- 10 Mar, 2016 7 commits
-
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-