Fix custom user bug and update to 2.5.1 (#460)

* Fix custom user bug and update to 2.5.1

* Empty commit to retry codecov

Author: Ross Mechanic

CHANGES.rst

@@ -1,11 +1,12 @@
 Changes
 =======
 
-Unreleased
------------
+2.5.1 (2018-10-19)
+------------------
 - Add `'+'` as the `history_type` for each instance in `bulk_history_create` (gh-449)
 - Add support for  `history_change_reason` for each instance in `bulk_history_create` (gh-449)
-- Add `history_change_reason` in the history list view under the  `Change reason` display name
+- Add `history_change_reason` in the history list view under the  `Change reason` display name (gh-458)
+- Fix bug that caused failures when using a custom user model (gh-459)
 
 2.5.0 (2018-10-18)
 ------------------

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.0
+current_version = 2.5.1
 commit = True
 tag = True
 tag_name = {new_version}

simple_history/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-__version__ = '2.5.0'
+__version__ = '2.5.1'
 
 
 def register(

simple_history/models.py

@@ -8,8 +8,7 @@
 from django.apps import apps
 from django.conf import settings
 from django.contrib import admin
-from django.contrib.auth import get_user_model
-from django.db import models, router
+from django.db import models
 from django.db.models import Q
 from django.db.models.fields.proxy import OrderWrt
 from django.urls import reverse
@@ -26,7 +25,6 @@
     post_create_historical_record,
 )
 
-User = get_user_model()
 registered_models = {}
 
 
@@ -220,7 +218,9 @@ def copy_fields(self, model):
     def get_extra_fields(self, model, fields):
         """Return dict of extra fields added to the historical record model"""
 
-        user_model = self.user_model or User
+        user_model = self.user_model or getattr(
+            settings, 'AUTH_USER_MODEL', 'auth.User'
+        )
 
         def revert_url(self):
             """URL for this change in the default admin site."""