summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-115-29/+37
|\
| * Add tests for token auth.Pawel Chojnacki2017-07-061-4/+4
| * Finish refactring processed configuraiton, and add test validating ip range m...Pawel Chojnacki2017-07-051-3/+3
| * correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-051-1/+5
| * Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-2/+11
| * Remove the need to use health check tokenPawel Chojnacki2017-07-055-29/+24
* | Support multiple Redis instances based on queue typePaul Charlton2017-07-111-1/+4
* | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-081-33/+1
* | Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' in...Jacob Schatz2017-07-071-2/+1
|\ \
| * | Revert parent param removalLuke "Jared" Bennett2017-07-072-2/+2
| * | Removed merge_request/issue state_event param parent and removed issuable_pat...Luke "Jared" Bennett2017-07-072-3/+2
* | | Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-078-86/+104
|\ \ \
| * \ \ Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-071-5/+14
| |\ \ \
| | * \ \ Merge from master(Fix conflicts)Shinya Maeda2017-07-074-17/+115
| | |\ \ \ | | | |/ /
| | * | | Remove update|admin_pipeline_schedule from Project, and grant it in PipelineS...Kamil Trzcinski2017-07-071-0/+4
| | * | | merge from masterShinya Maeda2017-07-0754-148/+171
| | |\ \ \
| | * | | | 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
| | | |_|/ | | |/| |
| * | | | Merge branch '34590-fix-dashboard-labels-dropdown' into 'master'Sean McGivern2017-07-071-2/+7
| |\ \ \ \
| | * | | | Fix dashboard labels dropdownNick Thomas2017-07-071-2/+7
| | | |/ / | | |/| |
| * | | | Native group milestonesFelipe Artur2017-07-072-45/+60
| * | | | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-074-34/+22
| * | | | Merge branch '34736-n-1-problem-on-milestone-page' into 'master'Douwe Maan2017-07-071-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Avoid to repeat namespace querying on project milestoneTakuya Noguchi2017-07-071-0/+1
| | |/ /
* | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-077-21/+132
|\ \ \ \ | |/ / /
| * | | Name as variable_params like project variable controllerShinya Maeda2017-07-071-6/+10
| * | | 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-072-10/+10
| * | | Adopt project_variable_path instead of namespace_project_variable_path. (Reso...Shinya Maeda2017-07-071-2/+2
| * | | ayufan nice catchesShinya Maeda2017-07-072-14/+22
| * | | Fix variables_controller.rb and formatShinya Maeda2017-07-072-8/+9
| * | | Basic BE changeShinya Maeda2017-07-074-19/+100
| |/ /
| * | Add table for merge request commitsSean McGivern2017-07-061-1/+1
| * | Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-061-0/+2
| * | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-061-6/+9
| |\ \
| | * | Backports for ee-2112Lin Jen-Shin2017-07-061-6/+9
View Lorry Controller Status