summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern2018-06-051-9/+26
|\
| * Include all ancestors milestones in json list & autocomplete36862-subgroup-milestonesJarka Kadlecová2018-06-041-9/+26
* | Hide archived projects from `shared_projects`bvl-hide-archived-shared-projectsBob Van Landuyt2018-06-041-1/+10
* | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'm...Kamil Trzciński2018-06-013-8/+6
|\ \
| * | Refactor validations and make runner factory by default to be instance-wide r...Kamil Trzciński2018-05-313-8/+6
| * | Improve runner_type validations for Ci::RunnerDylan Griffith2018-05-311-1/+1
* | | Add validation to webhook and service URLs to ensure they are not blocked bec...Francisco Javier López2018-06-012-2/+2
| |/ |/|
* | Export assigned issues in iCalendar feedImre Farkas2018-05-311-10/+18
|/
* Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
* Merge branch 'bvl-group-shared-projects-private-api' into 'master'Sean McGivern2018-05-301-0/+59
|\
| * Fix small typosToon Claes2018-05-291-4/+4
| * Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+59
* | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-301-2/+21
|\ \
| * | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-2/+21
| |/
* | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-299-38/+98
|\ \
| * | Reduce CE/EE diff in spec/controllers/projects/project_members_controller_spe...Rémy Coutable2018-05-241-1/+1
| * | Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
| * | Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rbRémy Coutable2018-05-241-12/+6
| * | Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rbRémy Coutable2018-05-241-0/+12
| * | Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-241-0/+7
| * | Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-241-5/+4
| * | Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rbRémy Coutable2018-05-241-0/+18
| * | Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rbRémy Coutable2018-05-241-18/+48
| * | Reduce CE/EE diff in spec/controllers/boards/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
| |/
* | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-291-0/+13
|\ \
| * \ Merge branch 'security-users-can-update-their-password-without-entering-curre...Mayra Cabrera2018-05-291-0/+13
| |\ \ | | |/ | |/|
| | * Remove password and password_confirmation from whitelisted params in Profiles...Tiago Botelho2018-05-071-0/+13
* | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-258-74/+95
|\ \ \ | |/ /
| * | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-242-2/+2
| |\ \
| | * | Add cannot_be_merged_recheck merge_statuslulalala2018-05-172-2/+2
| * | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-25/+48
| * | | Exclude coverage data from the pipelines pageYorick Peterse2018-05-171-0/+6
| * | | Limit the number of pipelines to countYorick Peterse2018-05-171-4/+4
| * | | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-28/+5
| |\ \ \
| | * | | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-28/+5
| * | | | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-161-3/+3
| |/ / /
| * | | Fix cross-origin errors when attempting to download JavaScript attachmentsStan Hu2018-05-131-0/+15
| |/ /
| * | [Rails5] Fix spec/controllers/projects/jobs_controller_spec.rbb-rails5-fix-spec-controllers-projects-jobs_controller_spec-rbblackst0ne2018-05-111-12/+12
* | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-1112-112/+690
|\ \ \ | |/ /
| * | Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-071-0/+74
| |\ \
| | * | Allow to pause,resume,show,edit,destroy group runners (#10244)Dylan Griffith2018-05-071-0/+74
| | |/
| * | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-071-0/+72
| |\ \
| | * | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-071-0/+72
| * | | Merge branch 'live-trace-v2' into 'master'Grzegorz Bizon2018-05-071-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-076-1/+273
| | |\ \ | | | |/
| | * | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-033-33/+3
| | |\ \
| | * \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-262-2/+60
| | |\ \ \
| | * \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-243-5/+11
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-231-4/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-202-1/+28
| | |\ \ \ \ \ \
View Lorry Controller Status