diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 14:55:38 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-13 16:07:02 +0100 |
commit | f2024b1e06587c2b274d4982a48d80d052bba088 (patch) | |
tree | 8e73ddcd1352195b4d5a6c4193470d5261f4c07a | |
parent | 84d28209b6f8a63f35ad082bc8851e28550643e1 (diff) | |
download | gitlab-ce-f2024b1e06587c2b274d4982a48d80d052bba088.tar.gz |
More consistent method naming.
-rw-r--r-- | app/services/git_push_service.rb | 5 | ||||
-rw-r--r-- | app/services/git_tag_push_service.rb | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index bfabfd7ade3..4885e1b2fc5 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -53,7 +53,8 @@ class GitPushService process_commit_messages(ref) end - @push_data = post_receive_data(oldrev, newrev, ref) + @push_data = build_push_data(oldrev, newrev, ref) + EventCreateService.new.push(project, user, @push_data) project.execute_hooks(@push_data.dup, :push_hooks) project.execute_services(@push_data.dup, :push_hooks) @@ -101,7 +102,7 @@ class GitPushService end end - def post_receive_data(oldrev, newrev, ref) + def build_push_data(oldrev, newrev, ref) Gitlab::PushDataBuilder. build(project, user, oldrev, newrev, ref, push_commits) end diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb index 666bc482f88..0d8e6e85e47 100644 --- a/app/services/git_tag_push_service.rb +++ b/app/services/git_tag_push_service.rb @@ -3,19 +3,21 @@ class GitTagPushService def execute(project, user, oldrev, newrev, ref) @project, @user = project, user - @push_data = create_push_data(oldrev, newrev, ref) + + @push_data = build_push_data(oldrev, newrev, ref) EventCreateService.new.push(project, user, @push_data) - project.repository.expire_cache project.execute_hooks(@push_data.dup, :tag_push_hooks) project.execute_services(@push_data.dup, :tag_push_hooks) + project.repository.expire_cache + true end private - def create_push_data(oldrev, newrev, ref) + def build_push_data(oldrev, newrev, ref) Gitlab::PushDataBuilder.build(project, user, oldrev, newrev, ref, []) end end |