summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Check if pipeline is nil before mergingzj-pipeline-can-be-nilZ.J. van de Weg2016-06-232-2/+10
* Merge branch '18855-wrap-code-in-activities-and-todos' into 'master' Dmitriy Zaporozhets2016-06-223-0/+9
|\
| * wrap code blocks on Activies and Todos pagewinniehell2016-06-203-0/+9
* | Merge branch 'feature/import-export-docs' into 'master' Achilleas Pipinellis2016-06-2210-1/+121
|\ \
| * \ Merge branch 'master' into feature/import-export-docsAchilleas Pipinellis2016-06-2299-745/+826
| |\ \
| * | | Give images proper namesAchilleas Pipinellis2016-06-226-5/+5
| * | | Add note about the shared directoryAchilleas Pipinellis2016-06-222-2/+8
| * | | Add colons in item listsAchilleas Pipinellis2016-06-221-7/+8
| * | | Add note about enabling import/export in existing installationsAchilleas Pipinellis2016-06-222-2/+6
| * | | Remove old docAchilleas Pipinellis2016-06-221-65/+0
| * | | Add note about settingsfeature/import-export-docsJames Lopez2016-06-221-0/+2
| * | | Refactor project import/export documentationAchilleas Pipinellis2016-06-213-38/+66
| * | | Move to new locationAchilleas Pipinellis2016-06-217-1/+66
| * | | updated based on feedbackJames Lopez2016-06-211-5/+3
| * | | update screenshot with new changesJames Lopez2016-06-211-0/+0
| * | | deleted images no longer neededJames Lopez2016-06-216-0/+0
| * | | moved link to bottom of the pageJames Lopez2016-06-211-2/+3
| * | | added nice to have - rake task and some changes to docsJames Lopez2016-06-213-4/+18
| * | | added some extra nice tasks to haveJames Lopez2016-06-211-4/+22
| * | | update docsJames Lopez2016-06-211-22/+20
| * | | import/export docsJames Lopez2016-06-217-0/+50
* | | | Merge branch 'award-emoji-docs' into 'master' Achilleas Pipinellis2016-06-224-14/+31
|\ \ \ \
| * | | | Expand on Award Emoji documentation, update/add screenshots. [ci skip]award-emoji-docsConnor Shea2016-06-214-14/+31
* | | | | Merge branch 'hotfix/better-container-registry-documentation' into 'master' Achilleas Pipinellis2016-06-221-0/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Oops ... TypoChris Wright2016-06-171-1/+1
| * | | | Add some docs for Docker Registry configurationChris Wright2016-06-171-0/+11
* | | | | Merge branch 'fix/error-typo' into 'master' Rémy Coutable2016-06-223-7/+7
|\ \ \ \ \
| * | | | | refactor to use haml insteadfix/error-typoJames Lopez2016-06-222-6/+6
| * | | | | fix typoJames Lopez2016-06-221-1/+1
* | | | | | Merge branch 'ci-wording' into 'master' Achilleas Pipinellis2016-06-227-45/+88
|\ \ \ \ \ \
| * | | | | | Fix linkci-wordingMark Pundsack2016-06-211-1/+1
| * | | | | | Add 'and builds'Mark Pundsack2016-06-201-1/+1
| * | | | | | Move Pipelines and Builds definitions to their own pageMark Pundsack2016-06-201-0/+38
| * | | | | | Move Pipelines and Builds definitions to their own pageMark Pundsack2016-06-203-55/+3
| * | | | | | Add CDMark Pundsack2016-06-202-13/+13
| * | | | | | Add pipeline imageMark Pundsack2016-06-202-19/+23
| * | | | | | Add definitions and tweak some docs. Partially fixes #17733Mark Pundsack2016-06-204-14/+67
* | | | | | | Merge branch 'custom-registry-storage-docs' into 'master' Marin Jankovski2016-06-221-2/+73
|\ \ \ \ \ \ \
| * | | | | | | Add documentation and examples for configuring cloud storage for registry ima...custom-registry-storage-docsDJ Mountney2016-06-211-2/+73
* | | | | | | | Merge branch 'fix-network-links' into 'master' Douwe Maan2016-06-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary string interpolation.fix-network-linksConnor Shea2016-06-211-1/+1
| * | | | | | | | Fix Network graph links.Connor Shea2016-06-211-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix-auto-mr-close' into 'master' Douwe Maan2016-06-222-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix auto-MR-close text from branch namefix-auto-mr-closeSean McGivern2016-06-212-1/+2
* | | | | | | | | Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-a...Douwe Maan2016-06-2212-81/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix specs18871-check-improve-how-we-display-access-requesters-in-admin-areaRémy Coutable2016-06-212-14/+1
| * | | | | | | | | Fix specsRémy Coutable2016-06-202-2/+2
| * | | | | | | | | Display group/project access requesters separately in adminRémy Coutable2016-06-208-65/+35
* | | | | | | | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-2228-246/+222
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix and remove duplicate specs18755-fix-destroy-project-causes-post_decline_request-to-be-executedRémy Coutable2016-06-206-111/+2