Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1033: some merge commits were not skipped in GitLab #1034

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #1033: some merge commits were not skipped in GitLab #1034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 grimoire_elk/enriched/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def get_rich_item(self, item):
lines_added = 0
lines_removed = 0
for cfile in commit["files"]:
if 'action' not in cfile:
if 'action' not in cfile or cfile['action'] in ['AM', 'MA', 'MM', 'MR', 'RM']:
# merges are not counted
continue
eitem["files"] += 1
Expand Down