summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'make_markdown_tables_thinner' into 'master' Sean McGivern2017-04-284-0/+21
|\
| * Make markdown tables thinnerblackst0ne2017-04-274-0/+21
* | Merge branch 'project-list-alignment' into 'master' Phil Hughes2017-04-281-1/+1
|\ \
| * | Remove top padding on project list rowproject-list-alignmentAnnabel Dunstone Gray2017-04-271-1/+1
* | | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-2854-138/+674
|\ \ \
| * | | Use new renamed markup methoddm-blob-viewersDouwe Maan2017-04-271-1/+1
| * | | Add variable to save us a double lookupDouwe Maan2017-04-271-2/+3
| * | | Fix typoDouwe Maan2017-04-271-1/+1
| * | | Address feedbackDouwe Maan2017-04-274-16/+19
| * | | Explain BlobViewer::Base#render_errorDouwe Maan2017-04-272-0/+16
| * | | Explain how viewers are selected from RICH_VIEWERSDouwe Maan2017-04-272-13/+28
| * | | Fixed failing JS testsPhil Hughes2017-04-271-1/+1
| * | | Add specsDouwe Maan2017-04-273-6/+6
| * | | Small code tweaksDouwe Maan2017-04-271-12/+18
| * | | Set BlobViewer::Base.binary instead of .textDouwe Maan2017-04-2712-17/+17
| * | | Add BlobViewer::Base#binary? methodDouwe Maan2017-04-272-22/+30
| * | | Blob responds to text?Douwe Maan2017-04-271-1/+1
| * | | Refactor overriding max sizeDouwe Maan2017-04-277-26/+32
| * | | Render viewer error synchronously so that 'view the source' link will workDouwe Maan2017-04-277-32/+34
| * | | Address feedbackDouwe Maan2017-04-276-23/+29
| * | | Add test stubsDouwe Maan2017-04-271-2/+2
| * | | Fix some specsDouwe Maan2017-04-273-4/+2
| * | | Satisfy eslintDouwe Maan2017-04-271-18/+7
| * | | Download blob viewer is client-sideDouwe Maan2017-04-272-2/+4
| * | | Add BlobViewer JSDouwe Maan2017-04-273-0/+135
| * | | Allow LineHighlighter to be triggered by eventDouwe Maan2017-04-271-7/+13
| * | | Add JSON endpoint to get simple blob viewerDouwe Maan2017-04-272-2/+30
| * | | Add viewer switcherDouwe Maan2017-04-272-0/+14
| * | | Render blob viewer errorDouwe Maan2017-04-273-5/+25
| * | | Render blob using blob viewersDouwe Maan2017-04-274-6/+22
| * | | Move conditional inside copy_blob_source_buttonDouwe Maan2017-04-272-4/+4
| * | | Use Blob methods instead of BlobHelper helpersDouwe Maan2017-04-277-27/+11
| * | | Add rich blob viewersDouwe Maan2017-04-2721-18/+139
| * | | Add simple blob viewersDouwe Maan2017-04-2710-9/+66
| * | | Refactor Blob and add BlobViewer::BaseDouwe Maan2017-04-272-56/+151
| * | | Pass project to BlobDouwe Maan2017-04-274-5/+13
* | | | Merge branch 'fix_build_header_line_height' into 'master' Annabel Dunstone Gray2017-04-271-0/+1
|\ \ \ \
| * | | | Increase line-height in build-header so elements don't overlapdixpac2017-04-251-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'related-branch-ci-status-icon-alignment' into 'master' Annabel Dunstone Gray2017-04-271-4/+9
|\ \ \ \
| * | | | Fixed alignment of CI icon in related issues sectionrelated-branch-ci-status-icon-alignmentPhil Hughes2017-04-271-4/+9
* | | | | Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-271-1/+3
|\ \ \ \ \
| * | | | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validationDouwe Maan2017-04-261-1/+3
* | | | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-272-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-272-2/+2
* | | | | | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-271-0/+1
|\ \ \ \ \ \
| * | | | | | remove invalid servicesTiago Botelho2017-04-261-0/+1
* | | | | | | Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini...Sean McGivern2017-04-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct the resource counted for MR collapsed infoLuke "Jared" Bennett2017-04-261-1/+1
* | | | | | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-1/+2
| |/ / / / / / /