summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0313-148/+299
|\
| * 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
* | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-283-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-289-37/+84
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |/ / /
* | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-281-0/+2
|/ / / /
* | | | 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
* | | | Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-203-50/+40
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refactor members controller destroy actionDmitriy Zaporozhets2017-04-173-24/+29
| * | | Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-173-27/+12
* | | | Refactor changing files in web UIDouwe Maan2017-04-205-57/+44
* | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-194-0/+35
|\ \ \ \ | |_|/ / |/| | |
| * | | Use serializer for formatting cohorts dataSean McGivern2017-04-141-2/+4
| * | | Rename user cohorts -> cohortsSean McGivern2017-04-142-9/+9
| * | | Cache user cohorts results for a daySean McGivern2017-04-141-1/+3
| * | | Add user cohorts table to admin areaSean McGivern2017-04-142-1/+13
| * | | Add user activity service and spec. Also added relevant - NOT offline - migra...James Lopez2017-04-142-0/+11
| * | | Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+7
| * | | Port 'Add EE usage ping' to CESean McGivern2017-04-141-0/+1
| |/ /
* | | Use DeleteUserWorker for removing users via spam logssh-use-delete-worker-spam-logsStan Hu2017-04-171-1/+1
|/ /
* | Implement Users::BuildServicegeoandri2017-04-131-1/+1
View Lorry Controller Status