Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

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,

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",

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] }