summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-4/+16
|\
| * Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0410-53/+75
| |\
| * \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-037-134/+69
| |\ \
| * | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-281-2/+9
| * | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-283-9/+27
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load...Jacob Schatz2017-04-271-2/+7
| |\ \ \ \
| | * | | | Project deploy keys json end pointJarka Kadlecova2017-03-241-2/+7
* | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-5/+23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-5/+23
* | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-24/+8
|\ \ \ \ \ \
| * | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-24/+8
* | | | | | | 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-031-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed feature spec not waiting for ajax request to finishPhil Hughes2017-04-261-1/+1
| * | | | | Load milestone tabs asynchronouslyPhil Hughes2017-04-261-1/+3
* | | | | | 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-2027-300/+395
| |\ \ \ \ \ \
| * | | | | | | 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 '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-021-125/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-021-125/+14
* | | | | | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-021-0/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Implement ability to update hooksAlexander Randa2017-04-281-0/+13
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Use blob viewers for snippetsDouwe Maan2017-04-302-6/+19
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Accept default branch param on notifaction servicesZeger-Jan van de Weg2017-04-281-1/+1
|/ / / / / /
* | | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-281-5/+10
* | | | | | Refactor overriding max sizeDouwe Maan2017-04-271-0/+2
* | | | | | Add JSON endpoint to get simple blob viewerDouwe Maan2017-04-271-2/+13
* | | | | | 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-261-14/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-261-14/+7
* | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-241-0/+1
* | | | | Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-201-24/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Refactor members controller destroy actionDmitriy Zaporozhets2017-04-171-12/+0
| * | | | Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-171-12/+0
| |/ / /
* | | | Refactor changing files in web UIDouwe Maan2017-04-204-24/+15
View Lorry Controller Status