summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* Use preload to avoid Rails using JOINLin Jen-Shin2017-04-131-1/+1
* Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-2/+2
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-112-40/+37
|\
| * Fix specsDouwe Maan2017-04-092-5/+6
| * Some code tweaksDouwe Maan2017-04-081-6/+3
| * Fix specs and make tweaksDouwe Maan2017-04-081-30/+35
| * Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-17/+11
* | Change project view default for existing users and anonymous visitors to file...dz-fix-project-viewDmitriy Zaporozhets2017-04-101-1/+9
* | Remove the User#is_admin? methodblackst0ne2017-04-092-2/+2
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-076-77/+118
|\
| * Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea...Sean McGivern2017-04-071-8/+7
| |\
| | * Fix ref referenceKamil Trzcinski2017-04-071-3/+2
| | * create_params and update_params into trigger_paramsShinya Maeda2017-04-071-11/+4
| | * Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-072-2/+0
| | * Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-071-4/+6
| | * Add form for scheduled triggerShinya Maeda2017-04-072-2/+9
| * | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-071-0/+5
| |\ \
View Lorry Controller Status