Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correctly link ConvDev Index nav links to its controller.conv-dev-index-regression | Bryce Johnson | 2017-09-08 | 2 | -1/+1 |
| | |||||
* | Merge branch 'revert-f2421b2b' into 'master' | Robert Speicher | 2017-09-08 | 3 | -7/+0 |
|\ | | | | | | | | | Revert "Add option to change navigation color palette" See merge request !14148 | ||||
| * | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 3 | -7/+0 |
| | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | ||||
* | | Merge branch 'fix/ldap-typo-docs' into 'master' | Achilleas Pipinellis | 2017-09-08 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | [CE] Fix small typos in LDAP documentation See merge request !14153 | ||||
| * | | Update ldap.mdfix/ldap-typo-docs | James Lopez | 2017-09-08 | 1 | -1/+1 |
| |/ | |||||
* | | index project settings doc from other indexes | Marcia Ramos | 2017-09-08 | 2 | -0/+5 |
| | | |||||
* | | copyedit | Marcia Ramos | 2017-09-08 | 1 | -5/+5 |
| | | |||||
* | | fixes link | Marcia Ramos | 2017-09-08 | 1 | -1/+1 |
|/ | |||||
* | Docs new index for project's settings | Marcia Ramos | 2017-09-08 | 8 | -5/+80 |
| | |||||
* | Merge branch 'docs/yaml-hidden-keys' into 'master' | Marcia Ramos | 2017-09-08 | 1 | -11/+17 |
|\ | | | | | | | | | | | | | Clarify yaml hidden keys (jobs) Closes #37480 See merge request !14110 | ||||
| * | Clarify yaml hidden keys (jobs)docs/yaml-hidden-keys | Achilleas Pipinellis | 2017-09-08 | 1 | -11/+17 |
| | | |||||
* | | Adds a better explanation for alignment section | Filipa Lacerda | 2017-09-08 | 1 | -7/+18 |
| | | |||||
* | | Merge branch 'gpg' into 'master' | Rémy Coutable | 2017-09-08 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | update gpg_signed_commit to use 0xLONG format for gpg list keys See merge request !13839 | ||||
| * | | update gpg_signed_commit to use 0xLONG format for gpg list keys | Kevin Pankonen | 2017-09-07 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'patch-18' into 'master' | Rémy Coutable | 2017-09-08 | 1 | -2/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | clarify that only some Runner Executors have these security concerns See merge request !14068 | ||||
| * | | | clarify that only some Runner Executors have these security concerns | Ben Bodenmiller | 2017-09-06 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge branch 'rs-pick-security-into-master' into 'master' | Douwe Maan | 2017-09-08 | 2 | -4/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update master with 9.5.4 security patches See merge request !14131 | ||||
| * | | | | Merge branch 'rs-issue-36104' into 'security-9-5' | Douwe Maan | 2017-09-07 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166 | ||||
* | | | | | Improve clarity of Helm Chart docs | Joshua Lambert | 2017-09-08 | 4 | -39/+54 |
|/ / / / | |||||
* | | | | Add Auto DevOps docs | Achilleas Pipinellis | 2017-09-07 | 11 | -10/+455 |
| | | | | |||||
* | | | | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master' | Douwe Maan | 2017-09-07 | 3 | -17/+24 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944 | ||||
| * | | | | Update “Share with group lock” docs | Michael Kozono | 2017-09-06 | 3 | -17/+24 |
| | | | | | |||||
* | | | | | Update docs for confidential issues | Clement Ho | 2017-09-07 | 7 | -5/+19 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Sean McGivern | 2017-09-07 | 3 | -0/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619 | ||||
| * | | | | | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 3 | -0/+7 |
| |/ / / / | |||||
* | | | | | Add script and job to trigger a docs build | Achilleas Pipinellis | 2017-09-07 | 2 | -0/+21 |
| | | | | | |||||
* | | | | | Merge branch 'events-migration-cleanup' into 'master' | Sean McGivern | 2017-09-07 | 1 | -11/+12 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932 | ||||
| * | | | | Finish migration to the new events setupevents-migration-cleanup | Yorick Peterse | 2017-09-06 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241 | ||||
* | | | | | Merge branch 'feature/plantuml-restructured-text' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -1/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for PlantUML in reStructuredText See merge request !13900 | ||||
| * | | | | | Add documentation for PlantUML in reStructuredText | Markus Koller | 2017-08-29 | 1 | -1/+10 |
| | | | | | | |||||
* | | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix json response See merge request !13831 | ||||
| * | | | | | | fix json response | EmilienMottet | 2017-08-29 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'patch-15' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect reference in documentation See merge request !13733 | ||||
| * | | | | | | | Fix incorrect reference in documentation | Johan Brandhorst | 2017-08-21 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add example of docker login with personal access token See merge request !13668 | ||||
| * | | | | | | | | Add example of docker login with personal access token | Tim Hobbs | 2017-08-18 | 1 | -0/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor Text Fix See merge request !13946 | ||||
| * | | | | | | | | | Minor Text Fix | Sab94 | 2017-08-31 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ee_issue_928_backport' into 'master' | Sean McGivern | 2017-09-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group boards CE backport See merge request !13883 | ||||
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-09-06 | 81 | -558/+2225 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | ee_issue_928_backport | ||||
| * | | | | | | | | | Continue BE backport | Felipe Artur | 2017-08-31 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Add Security on protected branches | Fabio Busatto | 2017-09-07 | 3 | -0/+40 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'wiki_api' into 'master' | Grzegorz Bizon | 2017-09-07 | 2 | -0/+158 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API support for wiki pages Closes #12747 See merge request !13372 | ||||
| * | | | | | | | | | | Add API support for wiki pages | blackst0ne | 2017-09-07 | 2 | -0/+158 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'docs-37499-add-description-template-examples-to-the-docs' into ↵ | Achilleas Pipinellis | 2017-09-07 | 1 | -0/+54 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add description template examples to the docs Closes #37499 See merge request !14073 | ||||
| * | | | | | | | | | | Add full text example description template | Mark Fletcher | 2017-09-06 | 1 | -0/+45 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add link to GitLab project examples in Description Template documentation | Mark Fletcher | 2017-09-06 | 1 | -0/+9 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'docs/autodeploy-refactor' into 'master' | Achilleas Pipinellis | 2017-09-07 | 7 | -27/+151 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Autodeploy docs Closes #37151 See merge request !13906 | ||||
| * | | | | | | | | | | | Remove confusing Nginx example from Autodeploy docsdocs/autodeploy-refactor | Achilleas Pipinellis | 2017-09-06 | 2 | -79/+17 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Refactor Autodeploy docs | Achilleas Pipinellis | 2017-09-06 | 1 | -38/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a how it works section where Herokuish is mentioned - Make the notes more apparent - Merge the postgres variables section with its parent |