diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:35:36 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:35:36 +1100 |
| commit | 0a61d64877ad81e748e0a1a22f4851d91da11ebe (patch) | |
| tree | 600e77b1f8617f298b5434e870674149755825aa | |
| parent | 2047991363844b4f17216f94778b432ed198a412 (diff) | |
| parent | dad8fae744d8dd384d0da220663bfa8814a43dfc (diff) | |
| download | gitlab-ce-0a61d64877ad81e748e0a1a22f4851d91da11ebe.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/models/blob_viewer/composer_json.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/36611-error-in-getcomposer-link.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/blob_viewer/composer_json.rb b/app/models/blob_viewer/composer_json.rb index ef8b4aef8e8..def4879fbb5 100644 --- a/app/models/blob_viewer/composer_json.rb +++ b/app/models/blob_viewer/composer_json.rb @@ -9,7 +9,7 @@ module BlobViewer end def manager_url - 'https://getcomposer.com/' + 'https://getcomposer.org/' end def package_name diff --git a/changelogs/unreleased/36611-error-in-getcomposer-link.yml b/changelogs/unreleased/36611-error-in-getcomposer-link.yml new file mode 100644 index 00000000000..1ff6ec01684 --- /dev/null +++ b/changelogs/unreleased/36611-error-in-getcomposer-link.yml @@ -0,0 +1,5 @@ +--- +title: Fix external link to Composer website +merge_request: +author: +type: fixed |