- 23 Aug, 2016 20 commits
-
-
Ruben Davila authored
-
Achilleas Pipinellis authored
Doc slash commands loc See merge request !678
-
Achilleas Pipinellis authored
Additional documentation on protected branches for EE See merge request !677
-
Ruben Davila authored
-
Achilleas Pipinellis authored
Change slash commands docs location See merge request !5937
-
Achilleas Pipinellis authored
Document protected branches new behavior See merge request !5934
-
Achilleas Pipinellis authored
Documentation for Issue Boards ## What does this MR do? Add documentation for issue boards. ## What are the relevant issue numbers? - Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/17907 - Backend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5548 - Frontend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5554 See merge request !5713
-
Achilleas Pipinellis authored
Split Koding admin/user docs Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 See merge request !5938
-
Robert Speicher authored
Add Ruby 2.3 upgrade notes. The 8.10 to 8.11 docs didn't mention Ruby 2.3, now they do. See merge request !5940
-
Robert Speicher authored
Fix location of markdown help Resolves #21208, and incorrect link to the markdown style guide See merge request !5945
-
Robert Speicher authored
Fix for update 8.10-to-8.11.md doc. Fixed a typo in the docs to update Ruby. See merge request !5941
-
Robert Speicher authored
Remove tab stop from issuable form added by description templates See merge request !5929
-
Yorick Peterse authored
Fix typo in gitlab-workhorse header See merge request !5891
-
Robert Speicher authored
Bump SimpleCov merge timeout to 365 days ## What does this MR do? In case that CI pipeline fails because of intermittent errors in one of the jobs, when someone retries the only failing job located in the middle stage, the job that calculates compound coverage that is configured in later stage, and triggered after retrying job in the pipeline, will still return an accurate coverage value. Closes #21144 See merge request !5932
-
Jacob Schatz authored
Fixed enter key in search input not working ## What does this MR do? Fixes a bug where the enter key wouldn't search in the top nav search input Closes #20627 See merge request !5888
-
Robert Speicher authored
Fix project namespace links #### What does this MR do? Fixes pipeline links #### Why was this MR needed? Links went to a 404 on fork MR pipelines tab #### What are the relevant issue numbers? Closes #21107 See merge request !5912
-
Robert Speicher authored
Fix incorrect "stopped impersonation" log message Minor bug: Usernames were swapped in the log message. Closes #21015 See merge request !5949
-
Robert Speicher authored
Also check if Akismet is enabled, before showing the `Submit as spam` button. Fixes #21229 See merge request !5948
-
Robert Speicher authored
Fix Spinach branches spec I broke master by adding a branch to gitlab-test for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5961, which put the branch in this scenario off the first page
😆 See merge request !5964 -
Douwe Maan authored
Fix file links on project page Files view ## What does this MR do? Fix the project show page when the default view is set to Files so that the links work. ## Are there points in the code the reviewer needs to double check? I can't figure out what caused this to break
😕 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-com/support-forum/issues/959. ## 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) (N/A) - [x] API support added (N/A) - Tests - [x] Added for this feature/bug - [ ] 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 !5933
-
- 22 Aug, 2016 9 commits
-
-
Achilleas Pipinellis authored
Split Koding admin/user docs From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5938 See merge request !679
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Marin Jankovski authored
-
Marin Jankovski authored
-
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 4 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
-