Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

0a61d648 · blackst0ne · 20479913 · dad8fae7 · 0a61d648 · 0a61d648
Commit 0a61d648 authored Aug 18, 2017 by blackst0ne
Showing with 6 additions and 1 deletion

app/models/blob_viewer/composer_json.rb app/models/blob_viewer/composer_json.rb +1 -1

changelogs/unreleased/36611-error-in-getcomposer-link.yml changelogs/unreleased/36611-error-in-getcomposer-link.yml +5 -0

No files found.
--- 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

--- a/changelogs/unreleased/36611-error-in-getcomposer-link.yml
+++ b/changelogs/unreleased/36611-error-in-getcomposer-link.yml
+---
+title: Fix external link to Composer website
+merge_request:
+author:
+type: fixed