diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-14 10:48:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-14 10:48:05 +0000 |
| commit | 04aba7781af134eaa6f661408f3b91a68986cb1c (patch) | |
| tree | e0c46ae57b9a4467f414c5f86ff12692d8171859 | |
| parent | 2c0c9e26e82a99d11ddbacd4dc161de42fa78162 (diff) | |
| parent | 9ed59ee9f00ec31564f4f1f069f1cdcc7d78281b (diff) | |
| download | gitlab-ce-04aba7781af134eaa6f661408f3b91a68986cb1c.tar.gz | |
Merge branch 'web_hook_project_id' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | app/services/git_push_service.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/hooks/_data_ex.html.erb | 1 | ||||
| -rw-r--r-- | spec/services/git_push_service_spec.rb | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index f9d43e60de6..3ad41de397f 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -112,6 +112,7 @@ class GitPushService # ref: String, # user_id: String, # user_name: String, + # project_id: String, # repository: { # name: String, # url: String, @@ -136,6 +137,7 @@ class GitPushService ref: ref, user_id: user.id, user_name: user.name, + project_id: project.id, repository: { name: project.name, url: project.url_to_repo, diff --git a/app/views/projects/hooks/_data_ex.html.erb b/app/views/projects/hooks/_data_ex.html.erb index b4281fa18c7..5092aaf6750 100644 --- a/app/views/projects/hooks/_data_ex.html.erb +++ b/app/views/projects/hooks/_data_ex.html.erb @@ -5,6 +5,7 @@ "ref": "refs/heads/master", "user_id": 4, "user_name": "John Smith", + "project_id": 15, "repository": { "name": "Diaspora", "url": "git@localhost:diaspora.git", diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index e3c25fa0469..2870f59195a 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -26,6 +26,7 @@ describe GitPushService do it { should include(ref: @ref) } it { should include(user_id: user.id) } it { should include(user_name: user.name) } + it { should include(project_id: project.id) } context "with repository data" do subject { @push_data[:repository] } |