Merge branch 'hotfix/1.3.6'

jmalcic · Oct 30, 2020 · ace00ae · ace00ae
2 parents c936c2c + b3c1e2d
commit ace00ae
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spina-admin-conferences (1.3.5)
+    spina-admin-conferences (1.3.6)
       babel-transpiler (~> 0.7)
       icalendar (~> 2.5)
       mobility (~> 0.8.10)

diff --git a/lib/spina/admin/conferences/migration/renaming.rb b/lib/spina/admin/conferences/migration/renaming.rb
@@ -65,7 +65,7 @@ def migrations_path
             end
 
             def engine_migration_glob(name)
-              "#{migrations_path}/**/*_#{name}.spina{_admin,}_conferences.rb"
+              "#{migrations_path}/**/*_#{name}.spina{_admin,}_conferences_engine.rb"
             end
 
             def detect_migration(name)

diff --git a/lib/spina/admin/conferences/version.rb b/lib/spina/admin/conferences/version.rb
@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '1.3.5'
+      VERSION = '1.3.6'
     end
   end
 end
diff --git a/package.json b/package.json
@@ -1,11 +1,7 @@
 {
   "name": "spina-admin-conferences",
-  "version": "1.0.0",
+  "version": "1.3.6",
   "description": "Conference management plugin for Spina.",
-  "main": "app/assets/javascripts/spina/admin/conferences/application.es6",
-  "files": [
-    "app/assets/javascripts/*.es6"
-  ],
   "repository": {
     "type": "git",
     "url": "jmalcic/spina-admin-conferences"

diff --git a/...00000000000_old_name.spina_conferences.rb → ...0000_old_name.spina_conferences_engine.rb b/...00000000000_old_name.spina_conferences.rb → ...0000_old_name.spina_conferences_engine.rb
diff --git a/...00000_new_name.spina_admin_conferences.rb → ...ew_name.spina_admin_conferences_engine.rb b/...00000_new_name.spina_admin_conferences.rb → ...ew_name.spina_admin_conferences_engine.rb
diff --git a/...00000000000_old_name.spina_conferences.rb → ...0000_old_name.spina_conferences_engine.rb b/...00000000000_old_name.spina_conferences.rb → ...0000_old_name.spina_conferences_engine.rb
diff --git a/test/spina/admin/conferences/migration/renaming_test.rb b/test/spina/admin/conferences/migration/renaming_test.rb
@@ -41,8 +41,8 @@ class << self
             @dummy_class.include(Renaming)
             @dummy_class.stale_migrations = [
               {
-                old: { name: 'old_name', file: '00000000000000_old_name.spina_conferences.rb' },
-                new: { name: 'new_name', file: '00000000000000_new_name.spina_conferences.rb' }
+                old: { name: 'old_name', file: '00000000000000_old_name.spina_conferences_engine.rb' },
+                new: { name: 'new_name', file: '00000000000000_new_name.spina_conferences_engine.rb' }
               }
             ]
             assert_raises Renaming::DuplicateMigrationsError do