summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-269-56/+84
|\ | | | | | | | | Add additional user and email services See merge request !12125
| * fix spec failuresJames Lopez2017-06-251-2/+2
| |
| * fix spec failuresJames Lopez2017-06-232-4/+2
| |
| * update code based on feedbackJames Lopez2017-06-232-5/+5
| |
| * fix profiles specJames Lopez2017-06-231-3/+3
| |
| * refactor update user service not to do auth checksJames Lopez2017-06-238-17/+17
| |
| * fix specsJames Lopez2017-06-231-3/+3
| |
| * more refactoringJames Lopez2017-06-233-7/+5
| |
| * add missing action to blockJames Lopez2017-06-231-3/+3
| |
| * more refactoring based on feedbackJames Lopez2017-06-234-12/+16
| |
| * refactor emails serviceJames Lopez2017-06-232-9/+3
| |
| * update missing email actionsJames Lopez2017-06-231-1/+1
| |
| * update to use emails destroy serviceJames Lopez2017-06-232-2/+2
| |
| * added service in the rest of controllers and classesJames Lopez2017-06-233-5/+5
| |
| * fix api and controller issuesJames Lopez2017-06-231-2/+2
| |
| * fix specsJames Lopez2017-06-231-7/+8
| |
| * update preferences controllerJames Lopez2017-06-231-1/+3
| |
| * updated emails, notifications and passwords controllerJames Lopez2017-06-233-12/+16
| |
| * fix profiles controllerJames Lopez2017-06-231-2/+2
| |
| * finish off refactoring users controllerJames Lopez2017-06-231-10/+25
| |
| * update users controllerJames Lopez2017-06-231-2/+5
| |
| * refactor profiles controller and update serviceJames Lopez2017-06-231-10/+11
| |
| * update profiles controller to use new serviceJames Lopez2017-06-231-10/+18
| |
* | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-231-1/+1
| | | | | | | | | | | | | | Being the good boyscouts, but mainly because of [the comment in the review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115) the words used for classes and variables are changed to not use builds anymore.
* | Improve performance for pipeline chartsZ.J. van de Weg2017-06-231-0/+5
|/ | | | | Achieved by using another table, which both has better indexes and is smaller. Now the data provided for the user is more valueable too.
* Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-224-0/+54
|\ | | | | | | | | | | | | Support additional prometheus metrics - review branch Closes #28717 See merge request !11712
| * Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branchPawel Chojnacki2017-06-2228-142/+82
| |\ | | | | | | | | | 28717-additional-metrics-review-branch
| * | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-204-12/+20
| | |
| * | Move Prometheus service to project modelPawel Chojnacki2017-06-162-7/+3
| | |
| * | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-1638-114/+212
| |\ \ | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-0766-301/+393
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml
| * | | | Use explicit instance of prometheus service and add access methods to itPawel Chojnacki2017-06-072-10/+6
| | | | |
| * | | | Explicitly require format.json in prometheus_controllerPawel Chojnacki2017-06-062-7/+16
| | | | | | | | | | | | | | | | | | | | + add missing prometheus_controller tests!
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-05-3014-57/+117
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | | | Add per deployment additional metricsPawel Chojnacki2017-05-251-0/+11
| | | | | |
| * | | | | Use before action to respond with 404 if prometheus metrics are missingPawel Chojnacki2017-05-251-1/+7
| | | | | |
| * | | | | Additional metrics initial work, with working metrics listing, but without ↵Pawel Chojnacki2017-05-252-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | actoual metrics mesurements
* | | | | | Merge branch 'backport-projects-mr-controller-changes' into 'master'Douwe Maan2017-06-221-3/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Backport changes to Projects::MergeRequestsController for gitlab-org/gitlab-ee!2200 See merge request !12358
| * | | | | Backport changes to Projects::MergeRequestsController for ↵Nick Thomas2017-06-211-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | gitlab-org/gitlab-ee!2200
* | | | | | Merge branch 'backport-check-project-feature' into 'master'Douwe Maan2017-06-217-32/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Backport "check_project_feature_available!" from EE and use it for CE controllers See merge request !12305
| * | | | | Use the new check_project_feature_available! method in project controllersNick Thomas2017-06-217-32/+13
| | | | | |
| * | | | | Backport check_project_feature_available! from EENick Thomas2017-06-211-1/+8
| | | | | |
* | | | | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2117-49/+49
| | | | | |
* | | | | | Merge branch 'disable-environment-list-polling' into 'master'Grzegorz Bizon2017-06-211-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable environment list polling as it breaks deployboard See merge request !12347
| * | | | | | Disable environment list polling as it breaks deployboardKamil Trzcinski2017-06-211-2/+0
| |/ / / / /
* | | | | | Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-201-2/+2
|/ / / / /
* | | | | Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-162-39/+9
| | | | |
* | | | | Remove old specs and add new onesFelipe Artur2017-06-161-1/+1
| | | | |
* | | | | Order merge requests by priorityFelipe Artur2017-06-161-1/+1
| | | | |
* | | | | Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-161-17/+1
| |_|_|/ |/| | |
View Lorry Controller Status