summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-05-0230-121/+451
|\
| * Better Explore Groups viewLuke "Jared" Bennett2017-05-029-44/+150
| * Merge branch 'pdflab-in-repo' into 'master' Phil Hughes2017-05-024-6/+145
| |\
| | * Move PDFLab into GitLabpdflab-in-repoSam Rose2017-04-284-6/+145
| * | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-1/+1
| * | Merge branch 'dm-blob-download-button' into 'master' Sean McGivern2017-05-013-5/+15
| |\ \
| | * | Show Raw button as Download for binary filesDouwe Maan2017-04-303-5/+15
| * | | Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-0116-60/+137
| |\ \ \ | | |/ /
| | * | Use blob viewers for snippetsDouwe Maan2017-04-3016-60/+137
| * | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quicklySean McGivern2017-05-011-9/+7
| |\ \ \
| | * | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-281-9/+7
* | | | | Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-3032-51/+118
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-293-13/+9
| * | | | Fix emoji alignment31595-emoji-btnAnnabel Dunstone Gray2017-04-281-2/+2
| | |/ / | |/| |
| * | | Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-283-9/+13
| |\ \ \
| | * | | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-273-9/+13
| * | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' Sean McGivern2017-04-2815-36/+23
| |\ \ \ \
| | * | | | Pull preserve into render helpersDouwe Maan2017-04-2815-36/+23
| * | | | | Merge branch 'dm-video-viewer' into 'master' Sean McGivern2017-04-284-2/+20
| |\ \ \ \ \
| | * | | | | 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_usersdz-improve-add-users-methodDmitriy Zaporozhets2017-04-281-0/+5
| * | | | | | 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 yourselfJacopo2017-04-284-7/+28
| | | |_|_|_|/ | | |/| | | |
| * | | | | | 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 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add test that asserts unicorns terminateJacob Vosmaer2017-04-261-0/+12
| * | | | | Add board_move slash commandAlex Sanford2017-04-283-1/+24
* | | | | | Fixed specsLuke "Jared" Bennett2017-04-282-25/+35
* | | | | | Removed Spinner usageLuke "Jared" Bennett2017-04-281-2/+0
* | | | | | Deleted spinner and specLuke "Jared" Bennett2017-04-281-29/+0
* | | | | | Corrected styling, less hackyLuke "Jared" Bennett2017-04-281-23/+6
* | | | | | Moved partialLuke "Jared" Bennett2017-04-282-1/+1
* | | | | | added balsamiq blobviewer classLuke "Jared" Bennett2017-04-281-0/+12
* | | | | | Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-2867-156/+726
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 thinnerblackst0ne2017-04-274-0/+21
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'project-list-alignment' into 'master' Phil Hughes2017-04-281-1/+1
| |\ \ \ \ \
| | * | | | | 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
| |\ \ \ \ \ \
| | * | | | | | 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