remove temp osc bc dataroot patch

Fixes #200
OSC · Aug 16, 2017 · f840d1c · f840d1c
1 parent 7a1051c
commit f840d1c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,7 +43,6 @@ tags
 /public/assets
 .env.local
 /config/initializers/ood.rb
-/config/initializers/fix_batch_connect_dataroot.rb
 
 # Ignore staged app
 /vendor/my_app

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Removed the ability to build a Rails app from a template as it copies from an
   outdated template. [#215](https://github.com/OSC/ood-dashboard/issues/215)
+- (Batch Connect) Removed temporary OSC patch that migrated Batch Connect app
+  data to a namespaced data root.
+  [#200](https://github.com/OSC/ood-dashboard/issues/200)
 
 ## [1.15.2] - 2017-07-24
 

diff --git a/bin/setup b/bin/setup
@@ -108,15 +108,6 @@ chdir APP_ROOT do
       source_file = "config/initializers/ood.rb.#{APP.site}.#{APP.portal}"
       cat source_file, target_file
     end
-
-    # config/initializers/fix_batch_connect_dataroot.rb
-    target_file = "config/initializers/fix_batch_connect_dataroot.rb"
-    if APP.site == "" # user wants to unset site settings
-      rm_f target_file
-    else
-      source_file = "config/initializers/fix_batch_connect_dataroot.rb.#{APP.site}"
-      cat source_file, target_file
-    end
   end
 
   if APP.production?

diff --git a/config/initializers/fix_batch_connect_dataroot.rb.osc b/config/initializers/fix_batch_connect_dataroot.rb.osc