Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion github_activity/github_activity.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ def filter_ignored(userlist):
item_contributors.add(committer)
# Only add merger if they're not a bot and not the author
if (
row.mergedBy
pd.notna(row.mergedBy)
and row.mergedBy != row.author
and not ignored_user(row.mergedBy)
):
Expand Down
2 changes: 1 addition & 1 deletion github_activity/graphql.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def is_bot(user_dict):

# Add some extra fields
def get_login(user):
return user["login"] if not pd.isna(user) else user
return user["login"] if pd.notna(user) else user

self.data["author"] = self.data["author"].map(get_login)
self.data["mergedBy"] = self.data["mergedBy"].map(get_login)
Expand Down