delta/gitlab/gitlab-ce.git/spec, branch patch-63 gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-bump-shoulda-matcher' into 'master' 2019-05-22T14:08:38+00:00 Jan Provaznik jprovaznik@gitlab.com 2019-05-22T14:08:38+00:00 bc4a18ecb9e85a5ee51541ed25b2cb9c4a2768b5 Bump shoulda-matchers to 4.0.1 See merge request gitlab-org/gitlab-ce!28443 
Bump shoulda-matchers to 4.0.1

See merge request gitlab-org/gitlab-ce!28443
 Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'" 2019-05-22T11:45:46+00:00 Kamil Trzciński ayufan@ayufan.eu 2019-05-22T11:45:46+00:00 4f20c9de6f8e09131d751174243214d9bd3b6419 This reverts merge request !27514 
This reverts merge request !27514
 Merge branch '61935-remove-code-left-over-from-when-clusters-were-always-project-specific' into 'master' 2019-05-22T10:53:30+00:00 Nick Thomas nick@gitlab.com 2019-05-22T10:53:30+00:00 9f54fdcc89c71022906cf72074c749c72b2abd58 remove `Clusters::Platforms::Kubernetes#actual_namespace` Closes #61935 See merge request gitlab-org/gitlab-ce!28391 
remove `Clusters::Platforms::Kubernetes#actual_namespace`

Closes #61935

See merge request gitlab-org/gitlab-ce!28391
 Merge branch 'jc-git-deduplication-service' into 'master' 2019-05-22T10:47:43+00:00 Nick Thomas nick@gitlab.com 2019-05-22T10:47:43+00:00 3846f89d4f9164e16313c11a78bdf9fa3ee2294e Add GitDeduplicationService Closes #60871 See merge request gitlab-org/gitlab-ce!28144 
Add GitDeduplicationService

Closes #60871

See merge request gitlab-org/gitlab-ce!28144
 Merge branch 'reorganize-tests-jobs-by-level' into 'master' 2019-05-22T10:21:38+00:00 Kamil Trzciński ayufan@ayufan.eu 2019-05-22T10:21:38+00:00 04c3c6dd5a415cdf73429eaead3178112fee2534 Reorganize test jobs by level See merge request gitlab-org/gitlab-ce!27514 
Reorganize test jobs by level

See merge request gitlab-org/gitlab-ce!27514
 Merge branch 'repo-list-row-component' into 'master' 2019-05-22T09:50:18+00:00 Filipa Lacerda filipa@gitlab.com 2019-05-22T09:50:18+00:00 e5e9466c9c7489816a3271575e582f560bb4709f Added tree list row component See merge request gitlab-org/gitlab-ce!28542 
Added tree list row component

See merge request gitlab-org/gitlab-ce!28542
 Merge branch '8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implementation-and-usage-geo' into 'master' 2019-05-22T08:26:40+00:00 Ash McKenzie amckenzie@gitlab.com 2019-05-22T08:26:40+00:00 0c7300cdde8b14f1538f3221beedcd824f0c7c7c Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation Closes gitlab-ee#8723 See merge request gitlab-org/gitlab-ce!28546 
Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementation

Closes gitlab-ee#8723

See merge request gitlab-org/gitlab-ce!28546
 #61441 Allow user to set email ID before setting up 2FA 2019-05-22T07:59:15+00:00 Kartikey Tanna tannakartikey@gmail.com 2019-05-22T07:59:15+00:00 fa3aa0c5a7e8910a658572dce3ad5291e1112db1 






Merge branch 'api-spec-scb' into 'master'
2019-05-22T07:39:35+00:00

Phil Hughes
me@iamphill.com

2019-05-22T07:39:35+00:00

d1e4f045ed12fb383182e2b5d414467f53d9590a

Resolve CE/EE diffs in api_spec

Closes gitlab-ee#6611

See merge request gitlab-org/gitlab-ce!28576




Resolve CE/EE diffs in api_spec

Closes gitlab-ee#6611

See merge request gitlab-org/gitlab-ce!28576






Fix remaining failures in shoulda-matcher
2019-05-22T06:19:07+00:00

Stan Hu
stanhu@gmail.com

2019-05-21T21:07:37+00:00

37a335e60edd4f4c8b61fd2f9ffe0f1d27e3bfb8

Starting with Rails 5, belongs_to now adds a presence validation to the
association, and so as of shoulda-matchers 4.0.0 the belong_to matcher
follows suit and tests that this validation is there by setting the
association to nil and asserting that there are validation errors. This
exposed an error with the `validate_branches` method: we need to check
the source and target project exist.





Starting with Rails 5, belongs_to now adds a presence validation to the
association, and so as of shoulda-matchers 4.0.0 the belong_to matcher
follows suit and tests that this validation is there by setting the
association to nil and asserting that there are validation errors. This
exposed an error with the `validate_branches` method: we need to check
the source and target project exist.