Commit a479362d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '31454-missing-project-id-pipeline-hook-data' into 'master'

Adds project_id to pipeline hook data

Closes #31454

See merge request gitlab-org/gitlab-ce!15044
parents bb43bb8f 2cad2830
...@@ -1092,6 +1092,7 @@ class Project < ActiveRecord::Base ...@@ -1092,6 +1092,7 @@ class Project < ActiveRecord::Base
def hook_attrs(backward: true) def hook_attrs(backward: true)
attrs = { attrs = {
id: id,
name: name, name: name,
description: description, description: description,
web_url: web_url, web_url: web_url,
......
---
title: Adds project_id to pipeline hook data
merge_request: 15044
author: Jacopo Beschi @jacopo-beschi
type: added
...@@ -76,6 +76,7 @@ X-Gitlab-Event: Push Hook ...@@ -76,6 +76,7 @@ X-Gitlab-Event: Push Hook
"user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80", "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
"project_id": 15, "project_id": 15,
"project":{ "project":{
"id": 15,
"name":"Diaspora", "name":"Diaspora",
"description":"", "description":"",
"web_url":"http://example.com/mike/diaspora", "web_url":"http://example.com/mike/diaspora",
...@@ -156,6 +157,7 @@ X-Gitlab-Event: Tag Push Hook ...@@ -156,6 +157,7 @@ X-Gitlab-Event: Tag Push Hook
"user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80", "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
"project_id": 1, "project_id": 1,
"project":{ "project":{
"id": 1,
"name":"Example", "name":"Example",
"description":"", "description":"",
"web_url":"http://example.com/jsmith/example", "web_url":"http://example.com/jsmith/example",
...@@ -206,6 +208,7 @@ X-Gitlab-Event: Issue Hook ...@@ -206,6 +208,7 @@ X-Gitlab-Event: Issue Hook
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}, },
"project": { "project": {
"id": 1,
"name":"Gitlab Test", "name":"Gitlab Test",
"description":"Aut reprehenderit ut est.", "description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/gitlabhq/gitlab-test", "web_url":"http://example.com/gitlabhq/gitlab-test",
...@@ -335,6 +338,7 @@ X-Gitlab-Event: Note Hook ...@@ -335,6 +338,7 @@ X-Gitlab-Event: Note Hook
}, },
"project_id": 5, "project_id": 5,
"project":{ "project":{
"id": 5,
"name":"Gitlab Test", "name":"Gitlab Test",
"description":"Aut reprehenderit ut est.", "description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/gitlabhq/gitlab-test", "web_url":"http://example.com/gitlabhq/gitlab-test",
...@@ -414,6 +418,7 @@ X-Gitlab-Event: Note Hook ...@@ -414,6 +418,7 @@ X-Gitlab-Event: Note Hook
}, },
"project_id": 5, "project_id": 5,
"project":{ "project":{
"id": 5,
"name":"Gitlab Test", "name":"Gitlab Test",
"description":"Aut reprehenderit ut est.", "description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/gitlab-org/gitlab-test", "web_url":"http://example.com/gitlab-org/gitlab-test",
...@@ -540,6 +545,7 @@ X-Gitlab-Event: Note Hook ...@@ -540,6 +545,7 @@ X-Gitlab-Event: Note Hook
}, },
"project_id": 5, "project_id": 5,
"project":{ "project":{
"id": 5,
"name":"Gitlab Test", "name":"Gitlab Test",
"description":"Aut reprehenderit ut est.", "description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/gitlab-org/gitlab-test", "web_url":"http://example.com/gitlab-org/gitlab-test",
...@@ -618,6 +624,7 @@ X-Gitlab-Event: Note Hook ...@@ -618,6 +624,7 @@ X-Gitlab-Event: Note Hook
}, },
"project_id": 5, "project_id": 5,
"project":{ "project":{
"id": 5,
"name":"Gitlab Test", "name":"Gitlab Test",
"description":"Aut reprehenderit ut est.", "description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/gitlab-org/gitlab-test", "web_url":"http://example.com/gitlab-org/gitlab-test",
...@@ -692,6 +699,7 @@ X-Gitlab-Event: Merge Request Hook ...@@ -692,6 +699,7 @@ X-Gitlab-Event: Merge Request Hook
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}, },
"project": { "project": {
"id": 1,
"name":"Gitlab Test", "name":"Gitlab Test",
"description":"Aut reprehenderit ut est.", "description":"Aut reprehenderit ut est.",
"web_url":"http://example.com/gitlabhq/gitlab-test", "web_url":"http://example.com/gitlabhq/gitlab-test",
...@@ -848,6 +856,7 @@ X-Gitlab-Event: Wiki Page Hook ...@@ -848,6 +856,7 @@ X-Gitlab-Event: Wiki Page Hook
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon" "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon"
}, },
"project": { "project": {
"id": 1,
"name": "awesome-project", "name": "awesome-project",
"description": "This is awesome", "description": "This is awesome",
"web_url": "http://example.com/root/awesome-project", "web_url": "http://example.com/root/awesome-project",
...@@ -919,6 +928,7 @@ X-Gitlab-Event: Pipeline Hook ...@@ -919,6 +928,7 @@ X-Gitlab-Event: Pipeline Hook
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon" "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
}, },
"project":{ "project":{
"id": 1,
"name": "Gitlab Test", "name": "Gitlab Test",
"description": "Atque in sunt eos similique dolores voluptatem.", "description": "Atque in sunt eos similique dolores voluptatem.",
"web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test", "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment