Skip to content

Commit

Permalink
Merge branch '1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Seldaek committed Nov 3, 2017
2 parents 308cf07 + fc9f8c2 commit bfed974
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Composer/Util/RemoteFilesystem.php
Expand Up @@ -198,7 +198,8 @@ protected function get($originUrl, $fileUrl, $additionalOptions = array(), $file
// Gitlab can be installed in a non-root context (i.e. gitlab.com/foo). When downloading archives the originUrl
// is the host without the path, so we look for the registered gitlab-domains matching the host here
if (
is_array($this->config->get('gitlab-domains'))
$this->config
&& is_array($this->config->get('gitlab-domains'))
&& false === strpos($originUrl, '/')
&& !in_array($originUrl, $this->config->get('gitlab-domains'))
) {
Expand Down

0 comments on commit bfed974

Please sign in to comment.