summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-012-24/+61
|\
| * Use blob viewers for snippetsDouwe Maan2017-04-302-24/+61
* | 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 'dm-video-viewer' into 'master' Sean McGivern2017-04-282-0/+14
|\ \
| * | Display video blobs in-line like imagesdm-video-viewerDouwe Maan2017-04-282-0/+14
| |/
* | 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-281-0/+12
|\ \ \ | |_|/ |/| |
| * | Improve text on todo list when the todo action comes from yourselfJacopo2017-04-281-0/+12
* | | Add board_move slash commandAlex Sanford2017-04-281-0/+1
* | | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-2819-58/+383
|\ \ \
| * | | Fix typoDouwe Maan2017-04-271-1/+1
| * | | Address feedbackDouwe Maan2017-04-271-9/+12
| * | | Explain BlobViewer::Base#render_errorDouwe Maan2017-04-272-0/+16
| * | | Explain how viewers are selected from RICH_VIEWERSDouwe Maan2017-04-272-13/+28
| * | | Add specsDouwe Maan2017-04-272-5/+5
| * | | 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
| * | | Refactor overriding max sizeDouwe Maan2017-04-273-22/+20
| * | | Address feedbackDouwe Maan2017-04-273-9/+8
| * | | Add test stubsDouwe Maan2017-04-271-2/+2
| * | | Download blob viewer is client-sideDouwe Maan2017-04-272-2/+4
| * | | Add rich blob viewersDouwe Maan2017-04-2711-0/+120
| * | | Add simple blob viewersDouwe Maan2017-04-275-0/+55
| * | | Refactor Blob and add BlobViewer::BaseDouwe Maan2017-04-272-56/+151
| * | | Pass project to BlobDouwe Maan2017-04-273-4/+12
| | |/ | |/|
* | | Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-271-1/+3
|\ \ \
| * | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validationDouwe Maan2017-04-261-1/+3
* | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-272-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-272-2/+2
* | | | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-271-0/+1
|\ \ \ \
| * | | | remove invalid servicesTiago Botelho2017-04-261-0/+1
* | | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-1/+2
|\ \ \ \ \
| * | | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-1/+2
| |/ / / /
* | | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-271-0/+9
|\ \ \ \ \
| * | | | | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-261-0/+9
| | |_|/ / | |/| | |
* | | | | Avoid including the MarkupHelperToon Claes2017-04-271-2/+1
* | | | | Refactor MarkupHelperDouwe Maan2017-04-271-1/+1
* | | | | Cache the rendered README, but post-process on showToon Claes2017-04-271-5/+10
* | | | | Add username to activity atom feed (!10802)winniehell2017-04-261-1/+1
|/ / / /
* | | | Merge branch 'backport-md-cache-fix' into 'master' Dmitriy Zaporozhets2017-04-261-1/+3
|\ \ \ \
| * | | | Swap a before_save call with a before_create/before_update pair to avoid a co...Nick Thomas2017-04-251-1/+3
| | |_|/ | |/| |
* | | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-261-0/+2
| |/ / |/| |
* | | Show correct size when MR diff overflowsSean McGivern2017-04-252-9/+10
|/ /
* | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-242-1/+9
|\ \
| * | Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributesDouwe Maan2017-04-242-1/+9
| |/
* | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' Sean McGivern2017-04-241-2/+13
|\ \
| * | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-pathStan Hu2017-04-241-2/+13
| |/