summaryrefslogtreecommitdiff
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master' Achilleas Pipinellis2016-10-251-2/+5
|\
| * Specify which Fog storage drivers are imported by default in backup_restore.mdBrad Jones2016-10-241-2/+5
* | Merge branch 'patch-7' into 'master' Rémy Coutable2016-10-251-1/+1
|\ \
| * | Changing gitlab-shell version to 3.6.6 instead of 3.6.3, later on the upgrade...Tobias Genberg2016-10-191-1/+1
* | | Merge branch 'improve-grape-dsl-rules' into 'master' Robert Speicher2016-10-253-6/+98
|\ \ \
| * | | Improve copyimprove-grape-dsl-rulesRémy Coutable2016-10-171-2/+2
| * | | More improvementsRémy Coutable2016-10-131-3/+3
| * | | Fix typoRémy Coutable2016-10-131-1/+1
| * | | Move the Grape DSL part from Doc styleguide to API styleguideRémy Coutable2016-10-132-11/+43
| * | | Add an API styleguideRémy Coutable2016-10-132-0/+60
* | | | Merge branch 'dklischies/gitlab-ce-master' into 'master' Achilleas Pipinellis2016-10-251-0/+6
|\ \ \ \
| * | | | Capitalize Gitdklischies/gitlab-ce-masterAchilleas Pipinellis2016-10-251-1/+1
| * | | | Add a note regarding syncing the git submodule conf to CI doc.Daniel Klischies2016-10-211-0/+6
* | | | | Add docker-compose environment initialization commandSonmez Kartal2016-10-251-0/+1
* | | | | Merge branch 'docs/fix-link-to-monitoring' into 'master' Achilleas Pipinellis2016-10-245-5/+5
|\ \ \ \ \
| * | | | | Fix old monitoring links to point to the new locationdocs/fix-link-to-monitoringAchilleas Pipinellis2016-10-245-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'backup-docker-docs' into 'master' Achilleas Pipinellis2016-10-241-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add an example of how to run the backups when using docker to the docsbackup-docker-docsDJ Mountney2016-10-211-0/+4
* | | | | Merge branch 'document-absolute-links' into 'master' Rémy Coutable2016-10-241-0/+8
|\ \ \ \ \
| * | | | | Document link syntax introduced by !5586document-absolute-linksWinnie2016-10-211-0/+8
| | |/ / / | |/| | |
* | | | | Merge branch '23146_19131_build-api_scope-doc' into 'master' Rémy Coutable2016-10-221-4/+4
|\ \ \ \ \
| * | | | | Fix documents and comments on Build API `scope`. #23146 #19131Lemures Lemniscati2016-10-221-4/+4
* | | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-10-221-1/+1
|\ \ \ \ \ \
| * | | | | | Fix docker.sock reference in config.toml Niels Keurentjes2016-07-101-1/+1
* | | | | | | Merge branch 'docs/dynamic-envs-yaml' into 'master' Achilleas Pipinellis2016-10-221-25/+135
|\ \ \ \ \ \ \
| * | | | | | | Refactor and add new functionality to CI yaml referencedocs/dynamic-envs-yamlAchilleas Pipinellis2016-10-201-25/+135
* | | | | | | | Merge branch 'fix-example-in-api-documentation' into 'master' Rémy Coutable2016-10-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix wrong endpoint in api/users documentation, fix same typo in spec describe...Airat Shigapov2016-10-211-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-212-1/+40
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-212-1/+40
| |/ / / / /
* | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-3/+3
|\ \ \ \ \ \
| * | | | | | Grammar fixes in docsWilfred Hughes2016-10-031-3/+3
* | | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Changed gitlab-shell version to avoid warning when precompiling the assets.Ismael Arenzana2016-10-071-1/+1
* | | | | | | Merge branch 'master' into 'master' Rémy Coutable2016-10-211-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Replace builds_emails_service.png to fit to new layout of GitLabChristian Meter2016-07-071-0/+0
* | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix `ref` parameter name for `commits/statuses` Pierre de La Morinerie2016-06-231-1/+1
* | | | | | | | | Merge branch 'edit-glossary' into 'master' Sean Packham2016-10-211-139/+246
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | added skipped definitionedit-glossaryevhoffmann2016-10-201-0/+2
| * | | | | | | | updated some links in definitionsevhoffmann2016-10-201-11/+23
| * | | | | | | | a round of terms and editsevhoffmann2016-10-191-137/+230
* | | | | | | | | Remove pagination description from individual docTakuya Noguchi2016-10-201-2/+0
* | | | | | | | | Fix a broken table in Project API docTakuya Noguchi2016-10-201-4/+4
* | | | | | | | | Fix import/export labels to cope with project and group labels. Added relevan...James Lopez2016-10-191-1/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-191-5/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | API: Fix Sytem hooks delete behaviorfix-system-hook-apiRobert Schilling2016-10-141-5/+2
* | | | | | | | Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-1713-87/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove /u/ prefix from user pages in documentationDmitriy Zaporozhets2016-10-1313-87/+87
* | | | | | | | | Updated logo from @lukeMatt Lee2016-10-171-0/+0