diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-02-13 10:51:12 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-02-13 10:51:12 +0000 |
| commit | a772e01051a07ce6f4b539b603b542bc23daad62 (patch) | |
| tree | 0a57fa61ea687e51e20ab35881ab68af6b5b496b | |
| parent | 2b68d0cdb36bf6b59efff9ca7209da65ed61777e (diff) | |
| parent | b178443854861befaa78798ee11273102767f28e (diff) | |
| download | gitlab-ce-a772e01051a07ce6f4b539b603b542bc23daad62.tar.gz | |
Merge branch '57410-api-create-release-link-with-ftp-address-return-400-bad-request' into 'master'
Add support for FTP assets for releases
Closes #57410
See merge request gitlab-org/gitlab-ce!25071
| -rw-r--r-- | app/models/releases/link.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/57410-api-create-release-link-with-ftp-address-return-400-bad-request.yml | 5 | ||||
| -rw-r--r-- | doc/api/releases/links.md | 1 | ||||
| -rw-r--r-- | spec/models/releases/link_spec.rb | 24 |
4 files changed, 31 insertions, 1 deletions
diff --git a/app/models/releases/link.rb b/app/models/releases/link.rb index 6f639e5a7b2..6c507c47752 100644 --- a/app/models/releases/link.rb +++ b/app/models/releases/link.rb @@ -6,7 +6,7 @@ module Releases belongs_to :release - validates :url, presence: true, url: true, uniqueness: { scope: :release } + validates :url, presence: true, url: { protocols: %w(http https ftp) }, uniqueness: { scope: :release } validates :name, presence: true, uniqueness: { scope: :release } scope :sorted, -> { order(created_at: :desc) } diff --git a/changelogs/unreleased/57410-api-create-release-link-with-ftp-address-return-400-bad-request.yml b/changelogs/unreleased/57410-api-create-release-link-with-ftp-address-return-400-bad-request.yml new file mode 100644 index 00000000000..6be6a2115b9 --- /dev/null +++ b/changelogs/unreleased/57410-api-create-release-link-with-ftp-address-return-400-bad-request.yml @@ -0,0 +1,5 @@ +--- +title: Add support for FTP assets for releases +merge_request: 25071 +author: Robert Schilling +type: added diff --git a/doc/api/releases/links.md b/doc/api/releases/links.md index ae99f3bd8b6..fd7b9d6e6e2 100644 --- a/doc/api/releases/links.md +++ b/doc/api/releases/links.md @@ -3,6 +3,7 @@ > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/41766) in GitLab 11.7. Using this API you can manipulate GitLab's [Release](../../user/project/releases/index.md) links. For manipulating other Release assets, see [Release API](index.md). +GitLab supports links links to `http`, `https`, and `ftp` assets. ## Get links diff --git a/spec/models/releases/link_spec.rb b/spec/models/releases/link_spec.rb index 06ed1438688..4dd26c976cc 100644 --- a/spec/models/releases/link_spec.rb +++ b/spec/models/releases/link_spec.rb @@ -77,4 +77,28 @@ describe Releases::Link do it { is_expected.to be_truthy } end + + describe 'supported protocols' do + where(:protocol) do + %w(http https ftp) + end + + with_them do + let(:link) { build(:release_link, url: protocol + '://assets.com/download') } + + it 'will be valid' do + expect(link).to be_valid + end + end + end + + describe 'unsupported protocol' do + context 'for torrent' do + let(:link) { build(:release_link, url: 'torrent://assets.com/download') } + + it 'will be invalid' do + expect(link).to be_invalid + end + end + end end |