summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog item18569-fix-diff-note-positionDouwe Maan2016-06-231-0/+1
* Restore old behavior around diff notes to outdated discussionsDouwe Maan2016-06-221-1/+1
* Fix CHANGELOGRémy Coutable2016-06-221-3/+5
* Merge branch 'doc_refactor_labels' into 'master' Achilleas Pipinellis2016-06-2220-18/+150
|\
| * Refactor labels documentationAchilleas Pipinellis2016-06-2214-26/+56
| * Move labels documentation to new locationdoc_refactor_labelsAchilleas Pipinellis2016-06-2118-117/+120
| * Add info on tooltipsAchilleas Pipinellis2016-06-211-0/+7
| * Refactor labels docsAchilleas Pipinellis2016-06-2112-9/+101
* | Merge branch 'expiry' into 'master' Achilleas Pipinellis2016-06-221-2/+2
|\ \
| * | Clarify artifact expiryexpiryMark Pundsack2016-06-211-2/+2
* | | Merge branch 'ci-git' into 'master' Achilleas Pipinellis2016-06-221-23/+80
|\ \ \
| * | | Update GIT_DEPTH wordingci-gitMark Pundsack2016-06-171-8/+26
| * | | Clean up TOCMark Pundsack2016-06-171-23/+23
| * | | Add to TOCMark Pundsack2016-06-171-0/+2
| * | | Add GIT_STRATEGY and GIT_DEPTHMark Pundsack2016-06-171-0/+37
* | | | 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