Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'make_markdown_tables_thinner' into 'master' | Sean McGivern | 2017-04-28 | 5 | -0/+25 |
|\ | |||||
| * | Make markdown tables thinner | blackst0ne | 2017-04-27 | 5 | -0/+25 |
* | | Merge branch 'project-list-alignment' into 'master' | Phil Hughes | 2017-04-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Remove top padding on project list rowproject-list-alignment | Annabel Dunstone Gray | 2017-04-27 | 1 | -1/+1 |
* | | | Merge branch 'dm-blob-viewers' into 'master' | Tim Zallmann | 2017-04-28 | 71 | -297/+1773 |
|\ \ \ | |||||
| * | | | Use new renamed markup methoddm-blob-viewers | Douwe Maan | 2017-04-27 | 2 | -1/+3 |
| * | | | Add variable to save us a double lookup | Douwe Maan | 2017-04-27 | 1 | -2/+3 |
| * | | | Fix typo | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| * | | | Address feedback | Douwe Maan | 2017-04-27 | 7 | -44/+53 |
| * | | | Explain BlobViewer::Base#render_error | Douwe Maan | 2017-04-27 | 2 | -0/+16 |
| * | | | Explain how viewers are selected from RICH_VIEWERS | Douwe Maan | 2017-04-27 | 2 | -13/+28 |
| * | | | Added specs for JS method to switch views | Phil Hughes | 2017-04-27 | 1 | -2/+39 |
| * | | | Fixed failing JS tests | Phil Hughes | 2017-04-27 | 2 | -4/+8 |
| * | | | Satisfy Rubocop | Douwe Maan | 2017-04-27 | 2 | -2/+0 |
| * | | | Add changelog | Douwe Maan | 2017-04-27 | 1 | -0/+5 |
| * | | | Add specs | Douwe Maan | 2017-04-27 | 12 | -51/+904 |
| * | | | Small code tweaks | Douwe Maan | 2017-04-27 | 2 | -16/+18 |
| * | | | Set BlobViewer::Base.binary instead of .text | Douwe Maan | 2017-04-27 | 12 | -17/+17 |
| * | | | Add BlobViewer::Base#binary? method | Douwe Maan | 2017-04-27 | 2 | -22/+30 |
| * | | | Blob responds to text? | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| * | | | Refactor overriding max size | Douwe Maan | 2017-04-27 | 7 | -26/+32 |
| * | | | Render viewer error synchronously so that 'view the source' link will work | Douwe Maan | 2017-04-27 | 12 | -44/+41 |
| * | | | Address feedback | Douwe Maan | 2017-04-27 | 6 | -23/+29 |
| * | | | Add test stubs | Douwe Maan | 2017-04-27 | 8 | -193/+33 |
| * | | | Fix feature specs | Douwe Maan | 2017-04-27 | 5 | -2/+28 |
| * | | | Fix some specs | Douwe Maan | 2017-04-27 | 5 | -9/+7 |
| * | | | Satisfy eslint | Douwe Maan | 2017-04-27 | 1 | -18/+7 |
| * | | | Download blob viewer is client-side | Douwe Maan | 2017-04-27 | 2 | -2/+4 |
| * | | | Add specs | Douwe Maan | 2017-04-27 | 3 | -13/+191 |
| * | | | Add BlobViewer JS | Douwe Maan | 2017-04-27 | 3 | -0/+135 |
| * | | | Allow LineHighlighter to be triggered by event | Douwe Maan | 2017-04-27 | 1 | -7/+13 |
| * | | | Add JSON endpoint to get simple blob viewer | Douwe Maan | 2017-04-27 | 2 | -2/+30 |
| * | | | Add viewer switcher | Douwe Maan | 2017-04-27 | 2 | -0/+14 |
| * | | | Render blob viewer error | Douwe Maan | 2017-04-27 | 3 | -5/+25 |
| * | | | Render blob using blob viewers | Douwe Maan | 2017-04-27 | 4 | -6/+22 |
| * | | | Move conditional inside copy_blob_source_button | Douwe Maan | 2017-04-27 | 2 | -4/+4 |
| * | | | Use Blob methods instead of BlobHelper helpers | Douwe Maan | 2017-04-27 | 7 | -27/+11 |
| * | | | Add rich blob viewers | Douwe Maan | 2017-04-27 | 21 | -18/+139 |
| * | | | Add simple blob viewers | Douwe Maan | 2017-04-27 | 10 | -9/+66 |
| * | | | Refactor Blob and add BlobViewer::Base | Douwe Maan | 2017-04-27 | 2 | -56/+151 |
| * | | | Pass project to Blob | Douwe Maan | 2017-04-27 | 4 | -5/+13 |
* | | | | Merge branch 'fix_build_header_line_height' into 'master' | Annabel Dunstone Gray | 2017-04-27 | 2 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Increase line-height in build-header so elements don't overlap | dixpac | 2017-04-25 | 2 | -0/+5 |
* | | | | | Merge branch 'related-branch-ci-status-icon-alignment' into 'master' | Annabel Dunstone Gray | 2017-04-27 | 2 | -4/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed alignment of CI icon in related issues sectionrelated-branch-ci-status-icon-alignment | Phil Hughes | 2017-04-27 | 2 | -4/+13 |
* | | | | | | Merge branch 'dm-fix-ghost-user-validation' into 'master' | Robert Speicher | 2017-04-27 | 3 | -1/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validation | Douwe Maan | 2017-04-26 | 3 | -1/+17 |
* | | | | | | | Merge branch '31464-move-bundle-check-to-before_script' into 'master' | Robert Speicher | 2017-04-27 | 2 | -8/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Run `bundle check` after `bundle install` instead of having a dedicated job f...31464-move-bundle-check-to-before_script | Rémy Coutable | 2017-04-26 | 2 | -8/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int... | Douwe Maan | 2017-04-27 | 7 | -36/+85 |
|\ \ \ \ \ \ \ |