Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dm-snippet-blob-viewers' into 'master' | Sean McGivern | 2017-05-01 | 16 | -60/+137 |
|\ | |||||
| * | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 16 | -60/+137 |
* | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quickly | Sean McGivern | 2017-05-01 | 1 | -9/+7 |
|\ \ | |||||
| * | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestor | Kim "BKC" Carlbäcker | 2017-04-28 | 1 | -9/+7 |
* | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac | Stan Hu | 2017-04-29 | 3 | -13/+9 |
* | | | Fix emoji alignment31595-emoji-btn | Annabel Dunstone Gray | 2017-04-28 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge branch 'tc-no-todo-service-select' into 'master' | Robert Speicher | 2017-04-28 | 3 | -9/+13 |
|\ \ | |||||
| * | | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select | Toon Claes | 2017-04-27 | 3 | -9/+13 |
* | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' | Sean McGivern | 2017-04-28 | 15 | -36/+23 |
|\ \ \ | |||||
| * | | | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 15 | -36/+23 |
* | | | | Merge branch 'dm-video-viewer' into 'master' | Sean McGivern | 2017-04-28 | 4 | -2/+20 |
|\ \ \ \ | |||||
| * | | | | Display video blobs in-line like imagesdm-video-viewer | Douwe Maan | 2017-04-28 | 4 | -2/+20 |
| |/ / / | |||||
* | | | | Merge branch 'dz-improve-add-users-method' into 'master' | Douwe Maan | 2017-04-28 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-method | Dmitriy Zaporozhets | 2017-04-28 | 1 | -0/+5 |
* | | | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' | Sean McGivern | 2017-04-28 | 4 | -7/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Improve text on todo list when the todo action comes from yourself | Jacopo | 2017-04-28 | 4 | -7/+28 |
* | | | | | | Accept default branch param on notifaction services | Zeger-Jan van de Weg | 2017-04-28 | 2 | -1/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'fix-sidebar-block-ref-test' into 'master' | Sean McGivern | 2017-04-28 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | add issues and merge-requests classes and use to find in rspecfix-sidebar-block-ref-test | Luke "Jared" Bennett | 2017-04-28 | 1 | -2/+2 |
* | | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2 | Sean McGivern | 2017-04-28 | 1 | -0/+12 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add test that asserts unicorns terminate | Jacob Vosmaer | 2017-04-26 | 1 | -0/+12 |
* | | | | | Add board_move slash command | Alex Sanford | 2017-04-28 | 3 | -1/+24 |
* | | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" | Dosuken shinya | 2017-04-28 | 2 | -5/+14 |
* | | | | | Merge branch 'make_markdown_tables_thinner' into 'master' | Sean McGivern | 2017-04-28 | 4 | -0/+21 |
|\ \ \ \ \ | |||||
| * | | | | | Make markdown tables thinner | blackst0ne | 2017-04-27 | 4 | -0/+21 |
| | |/ / / | |/| | | | |||||
* | | | | | 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 | 54 | -138/+674 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use new renamed markup methoddm-blob-viewers | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| * | | | | | | 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 | 4 | -16/+19 |
| * | | | | | | 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 |
| * | | | | | | Fixed failing JS tests | Phil Hughes | 2017-04-27 | 1 | -1/+1 |
| * | | | | | | Add specs | Douwe Maan | 2017-04-27 | 3 | -6/+6 |
| * | | | | | | Small code tweaks | Douwe Maan | 2017-04-27 | 1 | -12/+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 | 7 | -32/+34 |
| * | | | | | | Address feedback | Douwe Maan | 2017-04-27 | 6 | -23/+29 |
| * | | | | | | Add test stubs | Douwe Maan | 2017-04-27 | 1 | -2/+2 |
| * | | | | | | Fix some specs | Douwe Maan | 2017-04-27 | 3 | -4/+2 |
| * | | | | | | 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 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 |