diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 21:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 21:08:47 +0300 |
| commit | e689e858ede41a34b1e9132eba6a602632e6885e (patch) | |
| tree | 57f173714a177a70aa6631d77f10d5628d42cd90 /spec/controllers | |
| parent | 868e4e69bba7d3ddc2bf4899ee45d6c377a8e536 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb index 9a3fee5b43a..6bfec1b314e 100644 --- a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb +++ b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb @@ -14,16 +14,6 @@ describe Projects::DesignManagement::Designs::ResizedImageController do let(:sha) { design.versions.first.sha } before do - # TODO these tests are being temporarily skipped unless run in EE, - # as we are in the process of moving Design Management to FOSS in 13.0 - # in steps. In the current step the services have not yet been moved, - # and the `design` factory used in this test uses the `:with_smaller_image_versions` - # trait, which calls `GenerateImageVersionsService` to generate the - # smaller image versions. - # - # See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283. - skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee? - enable_design_management end |