Skip to content
Snippets Groups Projects
Commit c8794af5 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖
Browse files

Automatic merge of gitlab-org/gitlab master

parents 5c2a2b3f f5bfb5df
No related branches found
No related tags found
No related merge requests found
......@@ -37,6 +37,7 @@ def internal?
url.start_with?(release.project.web_url)
end
# `external?` is deprecated in 15.9 and will be removed in 16.0.
def external?
!internal?
end
......@@ -44,7 +45,7 @@ def external?
def hook_attrs
{
id: id,
external: external?,
external: external?, # `external` is deprecated in 15.9 and will be removed in 16.0.
link_type: link_type,
name: name,
url: url
......
......@@ -158,14 +158,14 @@ Example response:
"id":2,
"name":"awesome-v0.2.msi",
"url":"http://192.168.10.15:3000/msi",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
},
{
"id":1,
"name":"awesome-v0.2.dmg",
"url":"http://192.168.10.15:3000",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
],
......@@ -386,7 +386,7 @@ Example response:
"id":3,
"name":"hoge",
"url":"https://gitlab.example.com/root/awesome-app/-/tags/v0.11.1/binaries/linux-amd64",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
]
......@@ -594,7 +594,7 @@ Example response:
"id":3,
"name":"hoge",
"url":"https://gitlab.example.com/root/awesome-app/-/tags/v0.11.1/binaries/linux-amd64",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
],
......
......@@ -40,14 +40,14 @@ Example response:
"id":2,
"name":"awesome-v0.2.msi",
"url":"http://192.168.10.15:3000/msi",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
},
{
"id":1,
"name":"awesome-v0.2.dmg",
"url":"http://192.168.10.15:3000",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
]
......@@ -80,7 +80,7 @@ Example response:
"id":1,
"name":"awesome-v0.2.dmg",
"url":"http://192.168.10.15:3000",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
```
......@@ -122,7 +122,7 @@ Example response:
"name":"hellodarwin-amd64",
"url":"https://gitlab.example.com/mynamespace/hello/-/jobs/688/artifacts/raw/bin/hello-darwin-amd64",
"direct_asset_url":"https://gitlab.example.com/mynamespace/hello/-/releases/v1.7.0/downloads/bin/hellodarwin-amd64",
"external":false,
"external":false, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
```
......@@ -164,7 +164,7 @@ Example response:
"id":1,
"name":"new name",
"url":"http://192.168.10.15:3000",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"runbook"
}
```
......@@ -196,7 +196,7 @@ Example response:
"id":1,
"name":"new name",
"url":"http://192.168.10.15:3000",
"external":true,
"external":true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type":"other"
}
```
......@@ -1784,7 +1784,7 @@ Payload example:
"links": [
{
"id": 1,
"external": true,
"external": true, // deprecated in GitLab 15.9, will be removed in GitLab 16.0.
"link_type": "other",
"name": "Changelog",
"url": "https://example.net/changelog"
......
......@@ -18,7 +18,7 @@ class Link < Grape::Entity
} do |link|
::Releases::LinkPresenter.new(link).direct_asset_url
end
expose :external?, documentation: { type: 'boolean' }, as: :external
expose :external?, documentation: { type: 'boolean' }, as: :external # @deprecated
expose :link_type, documentation: { type: 'string', example: 'other' }
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment