Move all EE-specific code to ee/ and spec/ee/ directories part 2

This is a follow up from https://gitlab.com/gitlab-org/gitlab-ee/issues/2902

We no longer have EE directory, but we still have a lot of EE specific files residing in place. Let's move all of them, too.

• Migrations: https://gitlab.com/gitlab-org/gitlab-ee/issues/2902#note_36442081 $1671366
• Files in app $1671365
• Files in lib $1671367
• Geo: https://gitlab.com/gitlab-org/gitlab-ee/issues/3148
• spec/models/project_services/kubernetes_service_ee_spec.rb
• spec/requests/api/variables_ee_spec.rb
• spec/controllers/projects/issues_controller_ee_spec.rb
• spec/controllers/projects/merge_requests/creations_controller_ee_spec.rb
• spec/controllers/projects/settings/repository_controller_ee_spec.rb
• spec/controllers/projects/merge_requests_controller_ee_spec.rb
• spec/features/issues/sub_nav_ee_spec.rb
• spec/features/variables_ee_spec.rb
• spec/support/protected_tags/access_control_ee_spec.rb
• spec/support/shared_examples/features/protected_branches_access_control_ee.rb
• spec/javascripts/filtered_search/filtered_search_token_keys_issues_ee_spec.js
• app/views/layouts/nav/_admin_ee.html.haml
• app/assets/images/emoji/flag_ee.png (Please don't move the Estonian flag )
• app/assets/javascripts/filtered_search/filtered_search_token_keys_issues_ee.js
• ee/app/views/admin/monitoring/ee
• ee/app/views/devise/shared/ee
• ee/app/views/groups/ee
• ee/app/views/projects/ee
• ee/app/views/projects/protected_branches/ee
• ee/app/views/projects/protected_tags/ee
• ee/app/views/projects/settings/ee
• ee/app/views/projects/variables/ee
• ee/app/views/shared/issuable/form/ee
• ee/app/views/shared/members/ee

And those filenames don't contain EE at all.

marked this issue as related to #2902 (closed)

changed the description

marked this issue as related to #3094

From https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/ee_features.md#code-in-app

Code in app/

Place EE-specific controllers, finders, helpers, mailers, models, policies, serializers/entities, services, validators and workers in the top-level EE module namespace, and in the ee/ specific sub-directory:

• ee/app/controllers/ee/foos_controller.rb
• ee/app/finders/ee/foos_finder.rb
• ee/app/helpers/ee/foos_helper.rb
• ee/app/mailers/ee/foos_mailer.rb
• ee/app/models/ee/foo.rb
• ee/app/policies/ee/foo_policy.rb
• ee/app/serializers/ee/foo_entity.rb
• ee/app/serializers/ee/foo_serializer.rb
• ee/app/services/ee/foo/create_service.rb
• ee/app/validators/ee/foo_attr_validator.rb
• ee/app/workers/ee/foo_worker.rb

Why double use of a /ee dir: root-level /ee and /ee/app/<something>/ee ? I assumed the use of the root-level /ee was to prevent the need to have ee subdirs scattered around?

changed the description

@to1ne Please check the discussion at https://gitlab.com/gitlab-org/gitlab-ee/issues/2902#note_34832981

I am a bit unsure how we could get rid of that ee/ without messing with autoloading, unless we want to name the module a different way as https://gitlab.com/gitlab-org/gitlab-ee/issues/2902#note_34909990

@godfat I think several occurrences of # rubocop:disable RSpec/FilePath can be removed too, e.g. https://gitlab.com/gitlab-org/gitlab-ee/blob/master/spec/ee/spec/controllers/projects/boards_controller_spec.rb#L3

@to1ne Awesome, thanks. Should remove all of them.

mentioned in merge request !2652 (merged)

marked this issue as related to #3148

changed the description

mentioned in merge request !2673 (merged)

marked the checklist item spec/models/project_services/kubernetes_service_ee_spec.rb as completed

marked the checklist item spec/requests/api/variables_ee_spec.rb as completed

marked the checklist item spec/controllers/projects/issues_controller_ee_spec.rb as completed

marked the checklist item spec/controllers/projects/merge_requests/creations_controller_ee_spec.rb as completed

marked the checklist item spec/controllers/projects/settings/repository_controller_ee_spec.rb as completed

marked the checklist item spec/controllers/projects/merge_requests_controller_ee_spec.rb as completed

marked the checklist item spec/features/issues/sub_nav_ee_spec.rb as completed

marked the checklist item spec/features/issues/sub_nav_ee_spec.rb as incomplete

marked the checklist item spec/features/issues/sub_nav_ee_spec.rb as completed

marked the checklist item spec/features/variables_ee_spec.rb as completed

marked the checklist item spec/support/protected_tags/access_control_ee_spec.rb as completed

marked the checklist item spec/support/shared_examples/features/protected_branches_access_control_ee.rb as completed

changed the description

changed milestone to %10.0

changed the description

changed the description

From https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2248#note_38056610, I've added:

ee/app/views/admin/monitoring/ee
ee/app/views/devise/shared/ee
ee/app/views/groups/ee
ee/app/views/projects/ee
ee/app/views/projects/protected_branches/ee
ee/app/views/projects/protected_tags/ee
ee/app/views/projects/settings/ee
ee/app/views/projects/variables/ee
ee/app/views/shared/issuable/form/ee
ee/app/views/shared/members/ee

@to1ne Aren't those already in the EE directory? We should probably add EE prefix for those aren't in the ee/**/ee directories, and which would be a different list.

Did I miss something here?

By the way, thanks for pointing out that isn't EE specific :P

@godfat Yeah, maybe this issue isn't the right place. But what I meant was this move:

ee/app/views/admin/monitoring/ee            -> ee/app/views/ee/admin/monitoring
ee/app/views/devise/shared/ee               -> ee/app/views/ee/devise/shared                
ee/app/views/groups/ee                      -> ee/app/views/ee/groups                   
ee/app/views/projects/ee                    -> ee/app/views/ee/projects
ee/app/views/projects/protected_branches/ee -> ee/app/views/ee/projects/protected_branches
ee/app/views/projects/protected_tags/ee     -> ee/app/views/ee/projects/protected_tags     
ee/app/views/projects/settings/ee           -> ee/app/views/ee/projects/settings         
ee/app/views/projects/variables/ee          -> ee/app/views/ee/projects/variables
ee/app/views/shared/issuable/form/ee        -> ee/app/views/ee/shared/issuable/form
ee/app/views/shared/members/ee              -> ee/app/views/ee/shared/members            

After that, there would only be 1 ee subdir in the ee/app/views tree.

@to1ne Yes, good point, I think we could handle it here.

changed the description

changed milestone to %10.1

mentioned in issue #3379

marked this issue as related to #3379