Skip to content

Commit

Permalink
Issue: initial parameter for hipchat.
Browse files Browse the repository at this point in the history
  • Loading branch information
oresh committed Aug 22, 2014
1 parent f741ce0 commit 9905377
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/models/project_services/hipchat_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def fields
]
end

def execute(push_data, type)
def execute(push_data, type = 'push')
if type == 'merge'
gate[room].send('GitLab', create_merge_message(push_data))
else
Expand Down
2 changes: 2 additions & 0 deletions app/services/merge_requests/create_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ def execute
event_service.open_mr(merge_request, current_user)
notification_service.new_merge_request(merge_request, current_user)
merge_request.create_cross_references!(merge_request.project, current_user)
# @oresh Merge request created hook.
execute_hooks(merge_request)
execute_services(merge_request)
end

merge_request
Expand Down

0 comments on commit 9905377

Please sign in to comment.