summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge from master(Fix conflicts)Shinya Maeda2017-07-072-17/+27
|\
| * Use variable_params && variable_params_attributes in project variables_contro...Shinya Maeda2017-07-071-4/+8
| * Use new project_variables_path in this MRShinya Maeda2017-07-071-3/+3
| * gb nice catchesShinya Maeda2017-07-071-5/+5
| * Adopt project_variable_path instead of namespace_project_variable_path. (Reso...Shinya Maeda2017-07-071-2/+2
| * ayufan nice catchesShinya Maeda2017-07-071-7/+11
| * Fix variables_controller.rb and formatShinya Maeda2017-07-071-6/+8
| * Basic BE changeShinya Maeda2017-07-072-19/+19
* | Remove update|admin_pipeline_schedule from Project, and grant it in PipelineS...Kamil Trzcinski2017-07-071-0/+4
* | merge from masterShinya Maeda2017-07-0741-134/+138
|\ \ | |/
| * Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-061-0/+2
| * Backports for ee-2112Lin Jen-Shin2017-07-061-6/+9
| * Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-061-1/+1
| |\
| | * Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-051-1/+1
| | |\
| | * | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-051-1/+1
| | * | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-307-401/+387
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-2872-1458/+2453
| | |\ \ \
| | * | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-081-1/+1
| * | | | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-0541-127/+126
| | |_|_|/ | |/| | |
* | | | | Revert "Implement Ci::NestedUniquenessValidator"Shinya Maeda2017-07-061-2/+1
* | | | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-051-1/+2
* | | | | zj nice catchies 3Shinya Maeda2017-07-051-1/+1
* | | | | zh nich catches 2Shinya Maeda2017-07-051-2/+2
* | | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-2/+1
* | | | | Define authorize_update_pipeline_schedule and apply to :edit, :take_ownership...Shinya Maeda2017-07-051-4/+6
* | | | | Add functionality and security.Shinya Maeda2017-07-051-0/+2
* | | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-2/+3
* | | | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-051-8/+4
* | | | | zh nich catches 2Shinya Maeda2017-07-051-2/+2
* | | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-2/+1
* | | | | Define authorize_update_pipeline_schedule and apply to :edit, :take_ownership...Shinya Maeda2017-07-051-4/+6
* | | | | Add functionality and security.Shinya Maeda2017-07-051-0/+2
* | | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-2/+3
* | | | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-051-1/+2
|/ / / /
* | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-041-1/+1
| |_|/ |/| |
* | | Backport changes to Projects::IssuesController and the search barNick Thomas2017-06-291-4/+16
* | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-291-1/+1
|\ \ \
| * | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-291-1/+1
* | | | Merge branch '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-...Douwe Maan2017-06-291-1/+2
|\ \ \ \
| * | | | Use authorize_update_pipeline_schedule in PipelineSchedulesControllerShinya Maeda2017-06-281-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-295-396/+369
|\ \ \ \ | |_|/ / |/| | |
| * | | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-285-396/+369
| |/ /
* | | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-281-1/+1
|/ /
* | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-231-1/+1
* | Improve performance for pipeline chartsZ.J. van de Weg2017-06-231-0/+5
* | Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-223-0/+50
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-2217-113/+53
| |\ \
| * | | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-203-12/+16
| * | | Move Prometheus service to project modelPawel Chojnacki2017-06-162-7/+3
| * | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-1614-43/+55
| |\ \ \
View Lorry Controller Status