summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-09-29 16:08:54 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-09-29 16:08:54 +0800
commita11ba104fedfb1991e4000a51c27c796f9ecec9f (patch)
tree0fcf6a77233803423a331a74fd572f6fe1ed00a6
parent90fc30bcde5872ddb023f44d6ec1c2cee580036b (diff)
downloadgitlab-ce-38432-fix-notes-type-for-import.tar.gz
Simply setup store_full_sti_class instead of overriding38432-fix-notes-type-for-import
-rw-r--r--lib/github/import/global_sti_name.rb9
-rw-r--r--lib/github/import/legacy_diff_note.rb2
-rw-r--r--lib/github/import/note.rb2
3 files changed, 2 insertions, 11 deletions
diff --git a/lib/github/import/global_sti_name.rb b/lib/github/import/global_sti_name.rb
deleted file mode 100644
index 81cfa95b4fd..00000000000
--- a/lib/github/import/global_sti_name.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Github
- class Import
- module GlobalStiName
- def sti_name
- name[/[^:]\w+$/]
- end
- end
- end
-end
diff --git a/lib/github/import/legacy_diff_note.rb b/lib/github/import/legacy_diff_note.rb
index bfbffe8f433..18adff560b6 100644
--- a/lib/github/import/legacy_diff_note.rb
+++ b/lib/github/import/legacy_diff_note.rb
@@ -1,8 +1,8 @@
module Github
class Import
class LegacyDiffNote < ::LegacyDiffNote
- extend GlobalStiName
self.table_name = 'notes'
+ self.store_full_sti_class = false
self.reset_callbacks :commit
self.reset_callbacks :update
diff --git a/lib/github/import/note.rb b/lib/github/import/note.rb
index 41660ee335f..8cf4f30e6b7 100644
--- a/lib/github/import/note.rb
+++ b/lib/github/import/note.rb
@@ -1,8 +1,8 @@
module Github
class Import
class Note < ::Note
- extend GlobalStiName
self.table_name = 'notes'
+ self.store_full_sti_class = false
self.reset_callbacks :save
self.reset_callbacks :commit