Merge remote-tracking branch 'upstream/pull/2838'

[rails.git] / app / models / language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index bb1aa4bd26016758ad3d8b66d09a7527a72b8ad8..cdf85a52bc3530cb11dc0eb3e0a05ed29d7f7a56 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -7,7 +7,7 @@
 #  native_name  :string
 #
 
-class Language < ActiveRecord::Base
+class Language < ApplicationRecord
   self.primary_key = "code"
 
   has_many :diary_entries, :foreign_key => "language"