Merge pull request #3237 from jctanner/BACKPORT_SOCIAL_AUTH_FIX

The active user model does not need and does not have a github_id. (#…

Author: jctanner

galaxy/api/serializers/users.py

@@ -20,7 +20,6 @@
 USER_FIELDS = (
     'id', 'url', 'related', 'summary_fields', 'created', 'modified',
     'username', 'staff', 'full_name', 'date_joined', 'avatar_url',
-    'github_id'
 )
 
 __all__ = [
@@ -61,7 +60,7 @@ class UserSerializer(BaseSerializer):
 
     class Meta:
         model = User
-        fields = USER_FIELDS
+        fields = USER_FIELDS + ('github_id',)
 
     def get_related(self, obj):
         if not obj or not obj.is_authenticated: