summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Migrate SlackService and HipChat serviceKamil Trzcinski2015-12-107-1/+72
* Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-106-6/+55
* Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1073-1750/+602
* Merge branch 'tmp-reference-pipeline-and-caching' into 'master' Douwe Maan2015-12-10100-2551/+2662
|\
| * Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-10351-873/+2656
| |\
| * \ Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-08100-2551/+2662
| |\ \
| | * \ Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0861-217/+473
| | |\ \
| | * | | Fix RedactorFilterDouwe Maan2015-12-081-1/+1
| | * | | Move CombinedPipeline methods aroundDouwe Maan2015-12-082-6/+8
| | * | | Store the demodulized reference filter name in data attributeRobert Speicher2015-12-074-18/+18
| | * | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-07232-1350/+2600
| | |\ \ \
| | * \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0388-348/+380
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-02260-2488/+4137
| | |\ \ \ \ \
| | * | | | | | Move Markdown filters and pipelines into folders.Douwe Maan2015-11-1974-2042/+2007
| | * | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-19571-3223/+9811
| | |\ \ \ \ \ \
| | * | | | | | | gfm is no longerDouwe Maan2015-10-271-1/+1
| | * | | | | | | Reset memoized project repository when path changesDouwe Maan2015-10-272-2/+3
| | * | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-27113-729/+1365
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use single_line Markdown pipeline for commit descriptionDouwe Maan2015-10-231-1/+1
| | * | | | | | | | Fix specsDouwe Maan2015-10-221-4/+4
| | * | | | | | | | Slight refactoringDouwe Maan2015-10-221-10/+2
| | * | | | | | | | Use correct var nameDouwe Maan2015-10-221-1/+1
| | * | | | | | | | Use faster, more appropriate pipeline for mentionable attributesDouwe Maan2015-10-222-2/+2
| | * | | | | | | | Disabling caching in test environment because it was causing issues with Mark...Douwe Maan2015-10-222-9/+15
| | * | | | | | | | Use markdown with gfm pipeline rather than gfm methodDouwe Maan2015-10-222-2/+2
| | * | | | | | | | Fix Markdown XHTML context paramDouwe Maan2015-10-221-9/+10
| | * | | | | | | | Make pipelines actually make senseDouwe Maan2015-10-2114-178/+265
| | * | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-21280-2040/+3791
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Remove stray conflict markerDouwe Maan2015-10-151-1/+0
| | * | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1435-162/+402
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove unused Gitlab::Markdown#cached? methodDouwe Maan2015-10-141-5/+0
| | * | | | | | | | | | Cache rendered contents of issues, MRs and notesDouwe Maan2015-10-148-31/+51
| | * | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-14266-1935/+3780
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelinesDouwe Maan2015-10-145-126/+166
| | * | | | | | | | | | | Enable caching of Gitlab::Markdown rendered resultDouwe Maan2015-10-142-12/+27
| | * | | | | | | | | | | Use Gitlab::Markdown.render with :pipeline option rather than different methodsDouwe Maan2015-10-1414-177/+181
* | | | | | | | | | | | | Merge branch 'rs-snippets-clipboard'Douwe Maan2015-12-105-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add copy-to-clipboard button to Snippets#showrs-snippets-clipboardRobert Speicher2015-12-095-6/+14
* | | | | | | | | | | | | Merge branch 'rs-reset-db' into 'master' Kamil Trzciński2015-12-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Run db:reset before db:create on CIrs-reset-dbRobert Speicher2015-12-091-1/+1
* | | | | | | | | | | | | | Merge branch 'devise_paranoid_mode' into 'master' Robert Speicher2015-12-105-17/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-095-17/+21
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ui-fix' into 'master' Dmitriy Zaporozhets2015-12-101-19/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix list with controls displayDmitriy Zaporozhets2015-12-101-19/+25
* | | | | | | | | | | | | | | Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-messageDmitriy Zaporozhets2015-12-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | "No ssh" message should be same on project pageAndrew Tomaka2015-12-091-1/+1
* | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2015-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'yaml_safe_load' into 'master' Robert Speicher2015-12-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Allow [Symbol] when loading YAML Kamil Trzciński2015-12-091-2/+2
| * | | | | | | | | | | | | | | Use YAML.safe_loadKamil Trzciński2015-12-091-2/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
View Lorry Controller Status