summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix location of markdown help locationchange-markdown-help-locationJohn Northrup2016-08-221-1/+1
|
* Merge branch 'fix/coverage-report-merge-time' into 'master' Robert Speicher2016-08-221-1/+2
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Bump SimpleCov merge timeout to 365 daysfix/coverage-report-merge-timeGrzegorz Bizon2016-08-221-1/+2
| |
* | Merge branch 'cs-upgrade-ruby-docs' into 'master' Robert Speicher2016-08-221-7/+31
|\ \ | | | | | | | | | | | | | | | | | | 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
| * | Appease the linter.Connor Shea2016-08-221-2/+2
| | |
| * | Add Ruby 2.3 upgrade notes.Connor Shea2016-08-221-7/+31
|/ /
* | Merge branch 'docs-koding-change-loc' into 'master' Achilleas Pipinellis2016-08-2220-50/+58
|\ \ | | | | | | | | | | | | | | | | | | Split Koding admin/user docs Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 See merge request !5938
| * | Remove documentation rendering from /koding for nowdocs-koding-change-locAchilleas Pipinellis2016-08-221-3/+0
| | |
| * | Split Koding admin/user docsAchilleas Pipinellis2016-08-2219-47/+58
| | |
* | | Merge branch 'issue-boards-doc' into 'master' Achilleas Pipinellis2016-08-228-1/+193
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove link to docs from new list textissue-boards-docAchilleas Pipinellis2016-08-221-3/+0
| | | |
| * | | Add links to landing page and youtube videoAchilleas Pipinellis2016-08-221-0/+7
| | | |
| * | | Fix typos and grammarAchilleas Pipinellis2016-08-221-22/+27
| | | |
| * | | Add note about labels and system notesAchilleas Pipinellis2016-08-222-0/+5
| | | |
| * | | Mention missing labels for corresponding listsAchilleas Pipinellis2016-08-221-0/+1
| | | |
| * | | Add section on searching through the Backlog listAchilleas Pipinellis2016-08-222-0/+21
| | | |
| * | | Change images to reflect current status, add link to inline docsAchilleas Pipinellis2016-08-224-18/+24
| | | |
| * | | Complete rest of documentation for Issue BoardsAchilleas Pipinellis2016-08-223-49/+87
| | | |
| * | | Remove 10 lists limitAchilleas Pipinellis2016-08-221-2/+2
| | | |
| * | | Clean up Issue Board doc a bitAchilleas Pipinellis2016-08-221-37/+25
| | | |
| * | | Great refactor of Issue Board docsAchilleas Pipinellis2016-08-223-10/+89
| | | |
| * | | Documentation for Issue BoardsAchilleas Pipinellis2016-08-221-0/+45
| | | |
* | | | Merge branch 'doc-slash-commands-location' into 'master' Achilleas Pipinellis2016-08-223-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Change slash commands docs location See merge request !5937
| * | | Change location of slash commands in notes widgetAchilleas Pipinellis2016-08-221-1/+1
| | | |
| * | | Fix docs not rendering the pipe symbolAchilleas Pipinellis2016-08-221-1/+1
| | | |
| * | | Change location of slash commands docsAchilleas Pipinellis2016-08-222-1/+1
| |/ /
* | | Merge branch 'metrics-typo' into 'master' Yorick Peterse2016-08-224-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix typo in gitlab-workhorse header See merge request !5891
| * | | Fix typo in gitlab-workhorse headerJacob Vosmaer2016-08-194-4/+4
| | | |
* | | | Merge branch 'doc-protected-branches-new-behavior' into 'master' Achilleas Pipinellis2016-08-224-35/+46
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Document protected branches new behavior See merge request !5934
| * | | Conform to doc styleguide on new featuresAchilleas Pipinellis2016-08-221-2/+2
| | | |
| * | | Reword GitLab EE adAchilleas Pipinellis2016-08-221-1/+1
| | | |
| * | | Add changelog items to protected branches docsAchilleas Pipinellis2016-08-221-4/+7
| | | |
| * | | Document the new behavior of protected branchesAchilleas Pipinellis2016-08-214-35/+43
| | | |
* | | | Merge branch 'fix-empty-dropdown' into 'master' Rubén Dávila Santos2016-08-214-5/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Set default label if user unselects the option from dropdownfix-empty-dropdownAlfredo Sumaran2016-08-211-2/+6
| | | | |
| * | | | Toggle dropdown disabled attributeAlfredo Sumaran2016-08-211-3/+1
| | | | | | | | | | | | | | | | | | | | Before this the dropdowns were not being disabled if the user unselected an option from the allowed to merge/push dropdowns.
| * | | | Do not update if one dropdown has not selected any optionAlfredo Sumaran2016-08-211-0/+3
| | | | | | | | | | | | | | | | | | | | No need to update the branch permission if no option is marked on the dropdown
| * | | | Make dropdown selectablesAlfredo Sumaran2016-08-211-0/+2
| | |_|/ | |/| | | | | | | | | | This makes dropdown to look according the dropdowns on the edit form. This options add a tick mark next to the selected option.
* | | | Merge branch 'ce-fix-protected-branch' into 'master' Rubén Dávila Santos2016-08-211-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix inputs not being found due to incorrect class in wrap element Fixes failing spec See merge request !5926
| * | | Fix inputs not being found due to incorrect class in wrap elementce-fix-protected-branchAlfredo Sumaran2016-08-201-2/+2
|/ / /
* | | Merge branch 'fix-network-graph-error-500' into 'master' Rubén Dávila Santos2016-08-202-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-202-0/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | `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. Closes #21119, #21128
* | | Merge branch 'fix-rspec-failures-due-to-cached-permissions' into 'master' Rubén Dávila Santos2016-08-202-21/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-202-10/+11
| | | |
| * | | Add spec for Ability.project_abilitiesStan Hu2016-08-201-0/+63
| | | |
| * | | Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
|/ / / | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'gitlab_shell_version_update' into 'master' Marin Jankovski2016-08-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell to v3.4.0 Part of Redis Sentinel support: gitlab-org/gitlab-shell#29 See merge request !5920
| * | | Update gitlab-shell to v3.4.0gitlab_shell_version_updateMarin Jankovski2016-08-202-2/+2
|/ / /
* | | Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-204-83/+92
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!581 See merge request !5884
| * | | Add element container to dropdowns581-ee-backport-branch-permissionsAlfredo Sumaran2016-08-191-6/+8
| | | |
View Lorry Controller Status