summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix indentation and BuildsEmailServiceci-services-migrateKamil Trzcinski2015-12-112-6/+5
* Change default valuesKamil Trzcinski2015-12-115-11/+29
* Fix issue tracker serviceKamil Trzcinski2015-12-101-11/+7
* Fix specsKamil Trzcinski2015-12-101-0/+1
* Migrate SlackService and HipChat serviceKamil Trzcinski2015-12-103-0/+6
* Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-102-5/+8
* Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1043-1008/+324
* Merge branch 'tmp-reference-pipeline-and-caching' into 'master' Douwe Maan2015-12-1021-72/+68
|\
| * Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-1063-326/+696
| |\
| * \ Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-0821-72/+68
| |\ \
| | * \ Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0828-91/+242
| | |\ \
| | * \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-07165-912/+1270
| | |\ \ \
| | * \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0375-299/+291
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-02117-678/+1242
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-19297-1737/+3012
| | |\ \ \ \ \ \
| | * | | | | | | 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-2773-355/+522
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use single_line Markdown pipeline for commit descriptionDouwe Maan2015-10-231-1/+1
| | * | | | | | | | Use faster, more appropriate pipeline for mentionable attributesDouwe Maan2015-10-222-2/+2
| | * | | | | | | | Use markdown with gfm pipeline rather than gfm methodDouwe Maan2015-10-222-2/+2
| | * | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-21187-1317/+2000
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Remove stray conflict markerDouwe Maan2015-10-151-1/+0
| | * | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1422-124/+150
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Cache rendered contents of issues, MRs and notesDouwe Maan2015-10-146-20/+30
| | * | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-14172-1477/+1766
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelinesDouwe Maan2015-10-141-6/+9
| | * | | | | | | | | | | Use Gitlab::Markdown.render with :pipeline option rather than different methodsDouwe Maan2015-10-149-36/+19
* | | | | | | | | | | | | Merge branch 'rs-snippets-clipboard'Douwe Maan2015-12-104-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add copy-to-clipboard button to Snippets#showrs-snippets-clipboardRobert Speicher2015-12-094-6/+13
* | | | | | | | | | | | | Merge branch 'devise_paranoid_mode' into 'master' Robert Speicher2015-12-101-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-2/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | 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 branch 'issue_3854' into 'master' Dmitriy Zaporozhets2015-12-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Normalize email when looking for GitLab users from commit info. #3854issue_3854Rubén Dávila2015-12-091-2/+2
* | | | | | | | | | | | | | | Merge branch 'move-network'Dmitriy Zaporozhets2015-12-094-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove unnecessary codeDmitriy Zaporozhets2015-12-091-4/+3
| * | | | | | | | | | | | | | | Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-094-10/+17
* | | | | | | | | | | | | | | | Merge branch 'rs-delimit-build-counts' into 'master' Dmitriy Zaporozhets2015-12-091-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add number_with_delimiter to build countsrs-delimit-build-countsRobert Speicher2015-12-091-3/+6
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-095-28/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix specsDouwe Maan2015-12-081-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' into mr-brokenDouwe Maan2015-12-0857-189/+418
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-081-1/+1
| * | | | | | | | | | | | | | | | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-084-27/+61
* | | | | | | | | | | | | | | | | Merge branch 'rs-list-styling' into 'master' Dmitriy Zaporozhets2015-12-092-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Improve styling for mixed list stylesrs-list-stylingRobert Speicher2015-12-082-9/+11
View Lorry Controller Status