Merge branch 'js_fix2' into staging

CruGlobal · Dec 5, 2023 · 9c45733 · 9c45733
2 parents e3086f5 + 13f40c9
commit 9c45733
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,4 +1,3 @@
 //= link_directory ../stylesheets .scss
-//= link_directory ../javascript .js
 //= link_tree ../../javascript .js
 //= link_tree ../../../vendor/javascript .js
diff --git a/config/routes.rb b/config/routes.rb
@@ -21,5 +21,6 @@
 
   get "monitors/lb"
   get "/login/new", to: "login#new"
-  get "/packs/campaign.js", to: redirect("/assets/campaign-form.js")
+  get "/assets/campaign-form.js", to: redirect("/campaign-form.js")
+  get "/packs/campaign.js", to: redirect("/campaign-form.js")
 end
diff --git a/app/assets/javascript/campaign-form.js → public/campaign-form.js b/app/assets/javascript/campaign-form.js → public/campaign-form.js