summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author🏖 Rémy Coutable 🏖 <remy@rymai.me>2017-08-18 03:27:46 +0000
committer🏖 Rémy Coutable 🏖 <remy@rymai.me>2017-08-18 03:27:46 +0000
commitdad8fae744d8dd384d0da220663bfa8814a43dfc (patch)
tree5ca9c7c97c2562fb765ebeeb660d48630af21a12
parentf3203cbbc25586df622552153cc460d2f79f414e (diff)
parenta2aca22f1dc5bc1668a2e1997c8be4e5cfd26c5d (diff)
downloadgitlab-ce-dad8fae744d8dd384d0da220663bfa8814a43dfc.tar.gz
Merge branch '36611-error-in-getcomposer-link' into 'master'
Fix external link to Composer website Closes #36611 See merge request !13621
-rw-r--r--app/models/blob_viewer/composer_json.rb2
-rw-r--r--changelogs/unreleased/36611-error-in-getcomposer-link.yml5
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