summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-074-36/+74
|\
| * require uploaded file's name to match in any caseAlexis Reigel2018-06-051-38/+54
| * ability to get an image's alternative versionAlexis Reigel2018-06-051-0/+22
| * remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-053-3/+3
* | Log response body to production_json.log when a controller responds with a 42...Stan Hu2018-06-061-0/+58
* | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-061-0/+69
|\ \
| * | Handle exceptions outside the GraphQL schemaBob Van Landuyt2018-06-051-2/+13
| * | Add a minimal GraphQL APINick Thomas2018-06-051-0/+58
* | | Add missing tests around rendering invalid merge requests (HTML+JSON)Ash McKenzie2018-06-061-0/+20
* | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Kamil Trzciński2018-06-054-10/+50
|\ \ \ | |/ /
| * | Merge branch '46585-gdpr-terms-acceptance' into 'master'Robert Speicher2018-06-051-3/+19
| |\ \
| | * | Messaging on terms page when user already accepted46585-gdpr-terms-acceptancetauriedavis2018-06-041-3/+19
| * | | Render a 403 when showing an access denied messagebvl-403-for-external-auth-service-ceBob Van Landuyt2018-06-053-7/+31
| | |/ | |/|
* | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-0519-71/+254
|\ \ \ | |/ /
| * | 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 branch 'master' into backstage/gb/use-persisted-stages-to-improve-pipel...Grzegorz Bizon2018-05-294-54/+57
|\ \ \ \ | |/ / /
| * | | 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
| * | | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-1112-112/+690
| |\ \ \ \
| * | | | | Remove project billing context from controller specMatija Čupić2018-05-021-15/+7
| * | | | | Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-05-028-20/+89
| |\ \ \ \ \
| * | | | | | Remove Projects::Clusters::GcpController#list_projectsMatija Čupić2018-05-021-28/+0
View Lorry Controller Status