summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-305-19/+12
|
* Show Raw button as Download for binary filesDouwe Maan2017-04-303-5/+15
|
* Use blob viewers for snippetsDouwe Maan2017-04-3016-60/+137
|
* Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-283-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-selectToon Claes2017-04-273-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 McGivern2017-04-2815-36/+23
|\ \ | | | | | | | | | | | | Pull preserve into render helpers See merge request !10986
| * | Pull preserve into render helpersDouwe Maan2017-04-2815-36/+23
| | |
* | | Merge branch 'dm-video-viewer' into 'master' Sean McGivern2017-04-284-2/+20
|\ \ \ | | | | | | | | | | | | | | | | Add video blob viewer See merge request !10749
| * | | Display video blobs in-line like imagesdm-video-viewerDouwe Maan2017-04-284-2/+20
| |/ /
* | | Merge branch 'dz-improve-add-users-method' into 'master' Douwe Maan2017-04-281-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-methodDmitriy Zaporozhets2017-04-281-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' Sean McGivern2017-04-284-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 yourselfJacopo2017-04-284-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 servicesZeger-Jan van de Weg2017-04-282-1/+2
| | | | |
* | | | | Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-281-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-testLuke "Jared" Bennett2017-04-281-2/+2
| | | | |
* | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-281-0/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Unicorn worker termination tests See merge request !10818
| * | | | Add test that asserts unicorns terminateJacob Vosmaer2017-04-261-0/+12
| | | | |
* | | | | Add board_move slash commandAlex Sanford2017-04-283-1/+24
| | | | |
* | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-282-5/+14
| | | | |
* | | | | Merge branch 'make_markdown_tables_thinner' into 'master' Sean McGivern2017-04-284-0/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make markdown tables thinner Closes #14123 See merge request !10909
| * | | | | 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 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-2854-138/+674
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
| * | | | | | 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
| | | | | | |