- 22 Aug, 2016 4 commits
-
-
Marin Jankovski authored
-
Marin Jankovski authored
-
Ruben Davila authored
-
Ruben Davila authored
-
- 21 Aug, 2016 7 commits
-
-
Rubén Dávila Santos authored
Fix broken specs and UI for protected branches. The dropdowns were not using the proper css classes and the specs were not working because they were not testing it as a multi-select dropdown #### Before ![Screen_Shot_2016-08-21_at_12.55.20_PM](/uploads/c89080942b41182194cd94a948fc4d0a/Screen_Shot_2016-08-21_at_12.55.20_PM.png) #### After ![Screen_Shot_2016-08-21_at_12.54.19_PM](/uploads/f72c1828a87bc994e5f1f020bbe2c029/Screen_Shot_2016-08-21_at_12.54.19_PM.png) See merge request !676
-
Alfredo Sumaran authored
-
Ruben Davila authored
-
Ruben Davila authored
`user2` is not a member of the Project.
-
Ruben Davila authored
-
Rubén Dávila Santos authored
Fix inputs not being found due to incorrect class in wrap element Fixes failing spec See merge request !5926
-
Rubén Dávila Santos authored
Fix empty dropdown Deselecting the current selected option on a dropdown they were removing the input related to them. This led to a unexpected cases. The forms were submitted without all required inputs and the label was still indicating an option was selected. This MR fixes that. See merge request !5927
-
- 20 Aug, 2016 21 commits
-
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
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
-
Douwe Maan authored
Fix Projects::UpdateMirrorService to allow tags pointing to blob objects After the release of https://gitlab.com/gitlab-org/gitlab_git/merge_requests/103 we changed the way we return the target of tag objects, now it's a Commit object if there is some and nil in any other case, like when a tag points to a Blob object. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21040 See merge request !673
-
Jacob Schatz authored
17465 Fixed dropdown cursor key navigation ## What does this MR do? This MR fixes the use of cursor/arrow/enter key events with search dropdowns, allowing a user to navigate up and down the list with the arrow keys and then select their item with the enter key. It also applies some *minor* scroll user experience fixes, such as resetting the selected dropdown item every time it opens/closes (also stops multiple dropdowns conflicting) and forcing the dropdown scroll to scroll right to the top or bottom depending on whether they have selected the first or last item, respectively. ## Are there points in the code the reviewer needs to double check? I would like someone with GitLab experience to check over whether this would harm any unique implementations of the GitLabDropdown or SearchAutocomplete. ## Why was this MR needed? The current version has incorrectly behaving search dropdowns in the navbar, they either do not navigate using the keyboard or do not use the enter keystroke to select a highlighted item. ## What are the relevant issue numbers? Fixes #17465. Closes #20752. Closes #21014. **Contributes** to #20754. ## Screenshots (if relevant) ![17465.mp4](/uploads/1145abec226036abbaaa4aa46020f52b/17465.mp4) See merge request !4781
-
Rubén Dávila Santos authored
Fix assorted rspec failures due to stale, cached user permissions RequestStore is disabled in tests, but the Ability class was caching user permissions based on the user and project ID of previous test runs. Revise code to use RequestStore only if it is active. See merge request !5919
-
Marin Jankovski authored
Update gitlab-shell to v3.4.0 Part of Redis Sentinel support: gitlab-org/gitlab-shell#29 See merge request !5920
-
Rubén Dávila Santos authored
Fix Error 500 resulting when loading network graph `discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute: ```ruby irb(main):019:0> notes[0] Note Load (10.3ms) SELECT notes.commit_id, count(notes.id) as note_count FROM "notes" WHERE "notes"."project_id" = $1 AND (noteable_type = 'Commit') GROUP BY notes.commit_id [["project_id", 13083]] ActiveModel::MissingAttributeError: missing attribute: discussion_id ``` Closes #21119, #21128 See merge request !5922
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Douwe Maan authored
Backport changes from gitlab-org/gitlab-ee!581 See merge request !5884
-
Robert Speicher authored
Disable “issue by email” feature until it uses a different token Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11. See merge request !5915
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Douwe Maan authored
Todos sorting dropdown Implements #18135 ![todos_sorting](/uploads/bff76827c421628134dfb8b864e47c74/todos_sorting.png) - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5691
-
Rubén Dávila Santos authored
Call `set_discussion_id` again in DiffNote `before_validation` because the order is important See merge request !5913
-
- 19 Aug, 2016 8 commits
-
-
Robert Speicher authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Douwe Maan authored
Set `in_progress_merge_commit_sha` for fast-forward merges. - Closes #900 1. This flag is used in conjunction with the "Developers can Merge" branch permission, to allow a user to merge MRs without push access to a branch. 2. Without this flag set, the user doesn't have access to the protected branch, and the merge fails. 3. This flag was previously set for the `Repository#merge` method, but not the `Repository#ff_merge` method. See merge request !671
-
Rubén Dávila Santos authored
Resolve templates docs See merge request !672
-
Rubén Dávila Santos authored
Resolve templates docs See merge request !672
-
Achilleas Pipinellis authored
Refactor description templates documentation ## What are the relevant issue numbers? Refactors docs introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981 See merge request !5839
-
Stan Hu authored
Koding Integration ## What does this MR do? Will provide Koding integration with GitLab services. Forked from !4914. ## Are there points in the code the reviewer needs to double check? I've introduced new layouts which might not be necessary, first time contributor. ## Why was this MR needed? We're planning to ship Koding with GitLab. ## What are the relevant issue numbers? #12759 #14698 ## Screenshots (if relevant) ### Screencasts http://recordit.co/BDMbhwgxPD http://recordit.co/By0qiz1ClC ### Enable Koding in Application Settings ![image](/uploads/73a69421105c03aa2b0b47e2617d3fbc/image.png) ### Koding Dashboard ![image](/uploads/6c7dda34792280c0e4791e36af4eba11/image.png) ### Set up Koding Stack 1 - ![image](/uploads/d5c2b93f8e61b5cbffdb06f0267d485f/image.png) 2 - ![image](/uploads/44d9a9b574b8ac0c5eb553fb9653d5da/image.png) ### Run on Koding on Project Page ![image](/uploads/7d2b46221009074ffff75d66d5a1a555/image.png) ### Run in IDE on Merge Requests ![image](/uploads/65eed90c34c34b5fe7ad29ef9c717640/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5909
-