summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed avatar not displaying in issue boardsPhil Hughes2017-04-284-1/+8
| | | | | | This happens when Gravatar is disabled in the admin settings, the avatar is returned as null & then frontend didn't do anything about it. Closes #31428
* Merge branch 'improve-slack-docs' into 'master' Sean McGivern2017-04-284-66/+40
|\ | | | | | | | | Improve Slack docs See merge request !10927
| * Improve Slack docsVictor Wu2017-04-284-66/+40
|/
* Merge branch ↵Rémy Coutable2017-04-2810-20/+496
|\ | | | | | | | | | | | | | | | | | | '29181-add-more-tests-for-spec-controllers-projects-builds-controller-spec-rb' into 'master' Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" Closes #29181 See merge request !10244
| * Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-2810-20/+496
|/
* Merge branch 'make_markdown_tables_thinner' into 'master' Sean McGivern2017-04-285-0/+25
|\ | | | | | | | | | | | | Make markdown tables thinner Closes #14123 See merge request !10909
| * Make markdown tables thinnerblackst0ne2017-04-275-0/+25
| |
* | Merge branch 'project-list-alignment' into 'master' Phil Hughes2017-04-281-1/+1
|\ \ | | | | | | | | | | | | Remove top padding on project list row See merge request !10939
| * | 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-2871-297/+1773
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
| * | | Use new renamed markup methoddm-blob-viewersDouwe Maan2017-04-272-1/+3
| | | |
| * | | Add variable to save us a double lookupDouwe Maan2017-04-271-2/+3
| | | |
| * | | Fix typoDouwe Maan2017-04-271-1/+1
| | | |
| * | | Address feedbackDouwe Maan2017-04-277-44/+53
| | | |
| * | | Explain BlobViewer::Base#render_errorDouwe Maan2017-04-272-0/+16
| | | |
| * | | Explain how viewers are selected from RICH_VIEWERSDouwe Maan2017-04-272-13/+28
| | | |
| * | | Added specs for JS method to switch viewsPhil Hughes2017-04-271-2/+39
| | | |
| * | | Fixed failing JS testsPhil Hughes2017-04-272-4/+8
| | | |
| * | | Satisfy RubocopDouwe Maan2017-04-272-2/+0
| | | |
| * | | Add changelogDouwe Maan2017-04-271-0/+5
| | | |
| * | | Add specsDouwe Maan2017-04-2712-51/+904
| | | |
| * | | Small code tweaksDouwe Maan2017-04-272-16/+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-2712-44/+41
| | | |
| * | | Address feedbackDouwe Maan2017-04-276-23/+29
| | | |
| * | | Add test stubsDouwe Maan2017-04-278-193/+33
| | | |
| * | | Fix feature specsDouwe Maan2017-04-275-2/+28
| | | |
| * | | Fix some specsDouwe Maan2017-04-275-9/+7
| | | |
| * | | Satisfy eslintDouwe Maan2017-04-271-18/+7
| | | |
| * | | Download blob viewer is client-sideDouwe Maan2017-04-272-2/+4
| | | |
| * | | Add specsDouwe Maan2017-04-273-13/+191
| | | |
| * | | 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-272-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Increase line-height in build-header so elements don't overlap See merge request !10712
| * | | | Increase line-height in build-header so elements don't overlapdixpac2017-04-252-0/+5
| | | | |
* | | | | Merge branch 'related-branch-ci-status-icon-alignment' into 'master' Annabel Dunstone Gray2017-04-272-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of CI icon in related issues section Closes #31228 See merge request !10962
| * | | | | Fixed alignment of CI icon in related issues sectionrelated-branch-ci-status-icon-alignmentPhil Hughes2017-04-272-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | Closes #31228
View Lorry Controller Status