summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-043-55/+86
|\
| * Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-023-55/+86
* | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' Rémy Coutable2017-05-043-0/+6
|\ \
| * | Disable navigation to Pages config if Pages is disabledMark Fletcher2017-05-043-0/+6
| |/
* | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-042-15/+40
* | Merge branch 'dm-artifact-browser-header' into 'master' Robert Speicher2017-05-031-2/+6
|\ \
| * | Add breadcrumb, build header and pipelines submenu to artifacts browserDouwe Maan2017-05-031-2/+6
* | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-031-6/+9
|\ \ \
| * | | Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-6/+9
| |/ /
* | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-031-1/+1
|\ \ \
| * | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-1/+1
| |/ /
* | | Merge branch '28408-feature-proposal-include-search-options-to-pipelines-api'...Robert Speicher2017-05-031-5/+5
|\ \ \
| * | | - Add new parameters for Pipeline APIShinya Maeda2017-05-031-5/+5
| |/ /
* | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-033-3/+60
|\ \ \ | |/ / |/| |
| * | Fixed failing specsPhil Hughes2017-04-261-4/+4
| * | Added controller specsPhil Hughes2017-04-261-0/+11
| * | Fixed feature spec not waiting for ajax request to finishPhil Hughes2017-04-261-1/+1
| * | Load milestone tabs asynchronouslyPhil Hughes2017-04-263-2/+48
* | | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+18
|\ \ \
| * | | use represent_concise instead of separate entityPawel Chojnacki2017-04-241-1/+1
| * | | DeploymentsSerializer can serialize arrays properlyPawel Chojnacki2017-04-241-4/+3
| * | | Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_...Pawel Chojnacki2017-04-2063-511/+763
| |\ \ \
| * | | | Optionally filter by deployment timePawel Chojnacki2017-03-281-3/+5
| * | | | Use DeploymentSerializer to create deployment jsonPawel Chojnacki2017-03-281-1/+2
| * | | | Add endpoint that returns a list of deployments that happened within last 8.h...Pawel Chojnacki2017-03-281-0/+16
* | | | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-022-12/+6
|\ \ \ \ \
| * | | | | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-302-12/+6
* | | | | | Merge branch '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-026-126/+204
|\ \ \ \ \ \
| * | | | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-026-126/+204
* | | | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-022-4/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Implement ability to update hooksAlexander Randa2017-04-282-4/+35
* | | | | | | Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-014-6/+36
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Use blob viewers for snippetsDouwe Maan2017-04-304-6/+36
* | | | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-291-2/+2
|/ / / / /
* | | | | Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-281-2/+2
|\ \ \ \ \
| * | | | | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-271-2/+2
* | | | | | Accept default branch param on notifaction servicesZeger-Jan van de Weg2017-04-282-1/+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
* | | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-282-5/+14
* | | | | | Refactor overriding max sizeDouwe Maan2017-04-271-0/+2
* | | | | | Render viewer error synchronously so that 'view the source' link will workDouwe Maan2017-04-271-1/+1
* | | | | | Add JSON endpoint to get simple blob viewerDouwe Maan2017-04-272-2/+30
* | | | | | Use Blob methods instead of BlobHelper helpersDouwe Maan2017-04-271-1/+1
* | | | | | Pass project to BlobDouwe Maan2017-04-271-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-264-28/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-264-28/+36
| |/ / /
* | | | Show group name on flash container when group is created from Admin areaKushal Pandya2017-04-251-1/+1
* | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-241-0/+1
* | | | Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-membersDmitriy Zaporozhets2017-04-201-2/+6