summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
* Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-302-14/+12
|\
| * Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-302-14/+12
* | Merge branch 'sh-simplify-issues-spec' into 'master'Douwe Maan2018-05-301-1/+1
|\ \
| * | Simplify spec: `2.times.each` -> `2.times`Stan Hu2018-05-301-1/+1
* | | Merge branch '46917-gitlab-is-not-sending-objectstore-timeout-value-to-workho...Kamil Trzciński2018-05-301-0/+2
|\ \ \
| * | | Fix missing timeout value in object storage pre-authorization callAlessio Caiazza2018-05-291-0/+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 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-301-4/+100
|\ \ \ \
| * | | | Specs covering listing all gitlab:storage:* typesbrodock-refactor-hashed-storage-taskGabriel Mazetto2018-05-291-4/+100
* | | | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-301-0/+30
|\ \ \ \ \
| * | | | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-241-0/+30
* | | | | | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-302-1/+16
|\ \ \ \ \ \
| * | | | | | Add a regression test for clearing local storage upon issue creationStan Hu2018-05-291-0/+14
| * | | | | | Fix local storage not being cleared after creating a new issueStan Hu2018-05-291-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-305-38/+40
|\ \ \ \ \ \
| * | | | | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-291-2/+2
| * | | | | | Updated Mattermost integration to use Mattermost API v4Harrison Healey2018-05-284-36/+38
* | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-3012-21/+497
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-2912-21/+497
| | |_|/ / / | |/| | | |
* | | | | | 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-297-5/+102
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'security-fj-import-export-assignment' into 'master'Mayra Cabrera2018-05-295-4/+50
| |\ \ \ \ \ \ \
| | * | | | | | | Blacklisting attributes in the project import processFrancisco Javier López2018-05-145-4/+50
| * | | | | | | | Merge branch 'security-dm-delete-deploy-key' into 'master'Mayra Cabrera2018-05-291-1/+39
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix API to remove deploy key from project instead of deleting it entirelyDouwe Maan2018-05-041-1/+39
| * | | | | | | | | 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 'sh-batch-dependent-destroys' into 'master'Robert Speicher2018-05-291-0/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix project destruction failing due to idle in transaction timeoutssh-batch-dependent-destroysStan Hu2018-05-241-0/+60
* | | | | | | | | | | | Merge branch 'ab-35364-throttle-updates-last-repository-at' into 'master'Yorick Peterse2018-05-291-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Throttle updates to Project#last_repository_updated_at.Andreas Brandl2018-05-291-0/+13
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-295-124/+129
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow comment after if/unless clause46758-fallout-of-cacheable-attributeRémy Coutable2018-05-291-0/+12
| * | | | | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set wh...Rémy Coutable2018-05-294-124/+117
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Resolve "Merge request spinner spins forever after loading the diff"Lukas Eipert2018-05-292-6/+14
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Resolve "Operations navigation menu renders empty menu when user does not hav...Lukas Eipert2018-05-291-0/+12
* | | | | | | | | | | Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creatin...Kamil Trzciński2018-05-2917-313/+914
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Check the GCP cluster form for the GCP tokenMatija Čupić2018-05-281-1/+10
View Lorry Controller Status