Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add download button to project snippetsdm-snippet-download-button | Douwe Maan | 2017-04-30 | 5 | -19/+12 |
| | |||||
* | Show Raw button as Download for binary files | Douwe Maan | 2017-04-30 | 3 | -5/+15 |
| | |||||
* | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 16 | -60/+137 |
| | |||||
* | Merge branch 'tc-no-todo-service-select' into 'master' | Robert Speicher | 2017-04-28 | 3 | -9/+13 |
|\ | | | | | | | | | | | | | Avoid plucking Todo ids in TodoService Closes #30374 See merge request !10845 | ||||
| * | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select | Toon Claes | 2017-04-27 | 3 | -9/+13 |
| | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids | ||||
* | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' | Sean McGivern | 2017-04-28 | 15 | -36/+23 |
|\ \ | | | | | | | | | | | | | Pull preserve into render helpers See merge request !10986 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | | | | | | | | | Add video blob viewer See merge request !10749 | ||||
| * | | | 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_users See merge request !10975 | ||||
| * | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-method | Dmitriy Zaporozhets | 2017-04-28 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | 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 Closes #28020 See merge request !10594 | ||||
| * | | | | Improve text on todo list when the todo action comes from yourself | Jacopo | 2017-04-28 | 4 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx" | ||||
* | | | | | 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 rspec See merge request !10980 | ||||
| * | | | | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Unicorn worker termination tests See merge request !10818 | ||||
| * | | | | 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 Closes #14123 See merge request !10909 | ||||
| * | | | | | 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 row See merge request !10939 | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566 | ||||
| * | | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | 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 |
| | | | | | | |