Skip to content

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

Rémy Coutable requested to merge 3970-move-remaining-ee-only-app-files into master

What does this MR do?

This moves the EE-specific (non-JS) files from app/ to ee/app/.

› git diff ce/master..origin/master --name-status --diff-filter=A ./app/services | cut -f2 | xargs -t -L1 -I % dirname % | xargs -t -L1 -I % mkdir -p ee/%

dirname app/services/concerns/exclusive_lease_guard.rb
mkdir -p ee/app/services/concerns

› git diff ce/master..origin/master --name-status --diff-filter=A ./app/views | cut -f2 | xargs -t -L1 -I % dirname % | xargs -t -L1 -I % mkdir -p ee/%   

dirname app/views/shared/empty_states/icons/_deploy_board.svg
mkdir -p ee/app/views/shared/empty_states/icons
dirname app/views/shared/empty_states/icons/_service_desk_callout.svg
dirname app/views/shared/empty_states/icons/_service_desk_empty_state.svg
mkdir -p ee/app/views/shared/empty_states/icons
dirname app/views/shared/icons/_arrow_mini_pipeline_graph.svg
mkdir -p ee/app/views/shared/empty_states/icons
mkdirdirname -p app/views/shared/icons/_credit_card.svg ee/app/views/shared/icons

mkdirdirname -p app/views/shared/icons/_ee_trial.svg ee/app/views/shared/icons

mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_ee_trial_license_activated.svg
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_anchor.svg
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_anchor_broken.svg
dirnamemkdir app/views/shared/icons/_icon_audit_events_purple.svg -p
 ee/app/views/shared/icons
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_burndown_chart_splash.svg
dirname app/views/shared/icons/_icon_burndown_charts.svg
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_check.svg
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_checkmark.svg
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_contribution_analytics.svg
mkdir -p ee/app/views/shared/icons
dirnamemkdir app/views/shared/icons/_icon_dotted_circle.svg -p
 ee/app/views/shared/icons
mkdirdirname -p app/views/shared/icons/_icon_export_issues.svg ee/app/views/shared/icons

dirname app/views/shared/icons/_icon_fa_close.svg
mkdir -p ee/app/views/shared/icons
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_group_webhook.svg
dirname app/views/shared/icons/_icon_issue_board.svgmkdir
 -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_premium.svg
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_push_rules.svg
mkdir -p ee/app/views/shared/icons
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_icon_search_avatar.svg
mkdirdirname -p app/views/shared/icons/_icon_service_desk.svg ee/app/views/shared/icons

dirname app/views/shared/icons/_license.svg
mkdir -p ee/app/views/shared/icons
mkdir -p ee/app/views/shared/icons
dirname app/views/shared/icons/_missing_license.svg
dirnamemkdir app/views/shared/icons/_push_rules.svg
 -p ee/app/views/shared/icons
dirnamemkdir -p app/views/unsubscribes/show.html.haml ee/app/views/shared/icons

mkdir -p ee/app/views/unsubscribes

› git diff ce/master..origin/master --name-status --diff-filter=A ./app/workers | cut -f2 | xargs -t -L1 -I % dirname % | xargs -t -L1 -I % mkdir -p ee/%

dirname app/workers/concerns/delay.rb
mkdir -p ee/app/workers/concerns
dirname app/workers/repository_remove_remote_worker.rb
mkdir -p ee/app/workers

and then

› git diff ce/master..origin/master --name-status --diff-filter=A ./app/services | cut -f2 | xargs -t -L1 -I % git mv % ee/%                              

git mv app/services/concerns/exclusive_lease_guard.rb ee/app/services/concerns/exclusive_lease_guard.rb

› git diff ce/master..origin/master --name-status --diff-filter=A ./app/views | cut -f2 | xargs -t -L1 -I % git mv % ee/%   

git mv app/views/shared/empty_states/icons/_deploy_board.svg ee/app/views/shared/empty_states/icons/_deploy_board.svg
git mv app/views/shared/empty_states/icons/_service_desk_callout.svg ee/app/views/shared/empty_states/icons/_service_desk_callout.svg
git mv app/views/shared/empty_states/icons/_service_desk_empty_state.svg ee/app/views/shared/empty_states/icons/_service_desk_empty_state.svg
git mv app/views/shared/icons/_arrow_mini_pipeline_graph.svg ee/app/views/shared/icons/_arrow_mini_pipeline_graph.svg
git mv app/views/shared/icons/_credit_card.svg ee/app/views/shared/icons/_credit_card.svg
git mv app/views/shared/icons/_ee_trial.svg ee/app/views/shared/icons/_ee_trial.svg
git mv app/views/shared/icons/_ee_trial_license_activated.svg ee/app/views/shared/icons/_ee_trial_license_activated.svg
git mv app/views/shared/icons/_icon_anchor.svg ee/app/views/shared/icons/_icon_anchor.svg
git mv app/views/shared/icons/_icon_anchor_broken.svg ee/app/views/shared/icons/_icon_anchor_broken.svg
git mv app/views/shared/icons/_icon_audit_events_purple.svg ee/app/views/shared/icons/_icon_audit_events_purple.svg
git mv app/views/shared/icons/_icon_burndown_chart_splash.svg ee/app/views/shared/icons/_icon_burndown_chart_splash.svg
git mv app/views/shared/icons/_icon_burndown_charts.svg ee/app/views/shared/icons/_icon_burndown_charts.svg
git mv app/views/shared/icons/_icon_check.svg ee/app/views/shared/icons/_icon_check.svg
git mv app/views/shared/icons/_icon_checkmark.svg ee/app/views/shared/icons/_icon_checkmark.svg
git mv app/views/shared/icons/_icon_contribution_analytics.svg ee/app/views/shared/icons/_icon_contribution_analytics.svg
git mv app/views/shared/icons/_icon_dotted_circle.svg ee/app/views/shared/icons/_icon_dotted_circle.svg
git mv app/views/shared/icons/_icon_export_issues.svg ee/app/views/shared/icons/_icon_export_issues.svg
git mv app/views/shared/icons/_icon_fa_close.svg ee/app/views/shared/icons/_icon_fa_close.svg
git mv app/views/shared/icons/_icon_group_webhook.svg ee/app/views/shared/icons/_icon_group_webhook.svg
git mv app/views/shared/icons/_icon_issue_board.svg ee/app/views/shared/icons/_icon_issue_board.svg
git mv app/views/shared/icons/_icon_premium.svg ee/app/views/shared/icons/_icon_premium.svg
git mv app/views/shared/icons/_icon_push_rules.svg ee/app/views/shared/icons/_icon_push_rules.svg
git mv app/views/shared/icons/_icon_search_avatar.svg ee/app/views/shared/icons/_icon_search_avatar.svg
git mv app/views/shared/icons/_icon_service_desk.svg ee/app/views/shared/icons/_icon_service_desk.svg
git mv app/views/shared/icons/_license.svg ee/app/views/shared/icons/_license.svg
git mv app/views/shared/icons/_missing_license.svg ee/app/views/shared/icons/_missing_license.svg
git mv app/views/shared/icons/_push_rules.svg ee/app/views/shared/icons/_push_rules.svg
git mv app/views/unsubscribes/show.html.haml ee/app/views/unsubscribes/show.html.haml

› git diff ce/master..origin/master --name-status --diff-filter=A ./app/workers | cut -f2 | xargs -t -L1 -I % git mv % ee/%

git mv app/workers/concerns/delay.rb ee/app/workers/concerns/delay.rb
git mv app/workers/repository_remove_remote_worker.rb ee/app/workers/repository_remove_remote_worker.rb

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #3970 (closed)

Edited by Lin Jen-Shin

Merge request reports

Loading