Merge branch '3970-move-remaining-ee-only-app-files' into 'master'

Resolve "Move EE-only /app files under top-level /ee directory"

Closes #3970

See merge request gitlab-org/gitlab-ee!4317

app/assets/javascripts/environments/components/deploy_board_component.vue

@@ -9,7 +9,7 @@
    * [Mockup](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2f655655c0eadf655d0ae7467b53002a/environments__deploy-graphic.png)
    */
   import _ from 'underscore';
-  import deployBoardSvg from 'empty_states/icons/_deploy_board.svg';
+  import deployBoardSvg from 'ee_empty_states/icons/_deploy_board.svg';
   import { n__ } from '../../locale';
   import instanceComponent from './deploy_board_instance_component.vue';
   import loadingIcon from '../../vue_shared/components/loading_icon.vue';

app/assets/javascripts/vue_shared/components/link_to_member_avatar.js

 // Analogue of link_to_member_avatar in app/helpers/projects_helper.rb
-import pendingAvatarSvg from 'icons/_icon_dotted_circle.svg';
+import pendingAvatarSvg from 'ee_icons/_icon_dotted_circle.svg';
 
 export default {
   props: {

app/assets/javascripts/vue_shared/components/linked_pipelines_mini_list.vue

 <script>
-  import arrowSvg from 'icons/_arrow_mini_pipeline_graph.svg';
+  import arrowSvg from 'ee_icons/_arrow_mini_pipeline_graph.svg';
   import icon from './icon.vue';
   import ciStatus from './ci_icon.vue';
   import tooltip from '../directives/tooltip';

config/application.rb

@@ -37,7 +37,7 @@ module Gitlab
 
     config.generators.templates.push("#{config.root}/generator_templates")
 
-    # EE specific paths.
+    ## EE-specific paths config START
     ee_paths = config.eager_load_paths.each_with_object([]) do |path, memo|
       ee_path = config.root.join('ee', Pathname.new(path).relative_path_from(config.root))
       memo << ee_path.to_s if ee_path.exist?
@@ -47,6 +47,7 @@ module Gitlab
     config.paths['lib/tasks'] << "#{config.root}/ee/lib/tasks"
     config.paths['app/views'] << "#{config.root}/ee/app/views"
     config.helpers_paths << "#{config.root}/ee/app/helpers"
+    ## EE-specific paths config END
 
     # Rake tasks ignore the eager loading settings, so we need to set the
     # autoload paths explicitly

config/webpack.config.js

@@ -307,7 +307,6 @@ var config = {
   resolve: {
     extensions: ['.js'],
     alias: {
-      'ee':             path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
       '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
       'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
       'empty_states':   path.join(ROOT_PATH, 'app/views/shared/empty_states'),
@@ -315,6 +314,11 @@ var config = {
       'images':         path.join(ROOT_PATH, 'app/assets/images'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           'vue/dist/vue.esm.js',
+
+      'ee':              path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
+      'ee_empty_states': path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
+      'ee_icons':        path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
+      'ee_images':       path.join(ROOT_PATH, 'ee/app/assets/images'),
     }
   }
 }

spec/javascripts/approvals/approvals_footer_spec.js

 import Vue from 'vue';
 import _ from 'underscore';
-import pendingAvatarSvg from 'icons/_icon_dotted_circle.svg';
+import pendingAvatarSvg from 'ee_icons/_icon_dotted_circle.svg';
 import ApprovalsFooter from 'ee/vue_merge_request_widget/components/approvals/approvals_footer';
 
 (() => {