refactored notes logic

9fd35740 · James Lopez · 833dc320 · 9fd35740
Commit 9fd35740 authored Jun 13, 2016 by James Lopez
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

lib/gitlab/import_export/relation_factory.rb lib/gitlab/import_export/relation_factory.rb +5 -3

No files found.
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -57,9 +57,11 @@ module Gitlab

        author = @relation_hash.delete('author')

-        if admin_user? && @members_mapper.missing_author_ids.include?(old_author_id)
-          update_note_for_missing_author(author['name'])
-        end
+        update_note_for_missing_author(author['name']) if can_update_notes?
+      end
+
+      def can_update_notes?
+        (admin_user? && @members_mapper.missing_author_ids.include?(old_author_id)) || !admin_user?
      end

      def missing_author_note(updated_at, author_name)