Skip to content

Commit

Permalink
Fixed merged property from GitHub hook
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaume Florez committed Oct 20, 2016
1 parent 522b1a1 commit 86ecf49
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion hookshub/hooks/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ def repo_full_name(self):

@property
def merged(self):
return self.json['pull_request']['merged'] or False
if self.event == PULL_REQUEST:
return self.json['pull_request']['merged']
return False

def get_exe_action(self, action, conf):
exe_path = join(self.actions_path, action)
Expand Down

0 comments on commit 86ecf49

Please sign in to comment.