Support for gitlab subgroups and self-hosted instances (#28)

src/commits.js

@@ -15,7 +15,7 @@ const MERGE_PATTERNS = [
   /Merge pull request #(\d+) from .+\n\n(.+)/, // Regular GitHub merge
   /^(.+) \(#(\d+)\)(?:$|\n\n)/, // Github squash merge
   /Merged in .+ \(pull request #(\d+)\)\n\n(.+)/, // BitBucket merge
-  /Merge branch .+ into .+\n\n(.+)[\S\s]+See merge request !(\d+)/ // GitLab merge
+  /Merge branch .+ into .+\n\n(.+)[\S\s]+See merge request [^!]*!(\d+)/ // GitLab merge
 ]
 
 export async function fetchCommits (remote, options) {
@@ -146,7 +146,7 @@ function getCommitLink (hash, remote) {
   if (!remote) {
     return null
   }
-  if (remote.hostname === 'bitbucket.org') {
+  if (/bitbucket/.test(remote.hostname)) {
     return `${remote.url}/commits/${hash}`
   }
   return `${remote.url}/commit/${hash}`
@@ -169,10 +169,10 @@ function getMergeLink (id, remote) {
   if (!remote) {
     return null
   }
-  if (remote.hostname === 'bitbucket.org') {
+  if (/bitbucket/.test(remote.hostname)) {
     return `${remote.url}/pull-requests/${id}`
   }
-  if (remote.hostname === 'gitlab.com') {
+  if (/gitlab/.test(remote.hostname)) {
     return `${remote.url}/merge_requests/${id}`
   }
   return `${remote.url}/pull/${id}`

src/releases.js

@@ -71,7 +71,7 @@ function getCompareLink (from, to, remote) {
   if (!remote) {
     return null
   }
-  if (remote.hostname === 'bitbucket.org') {
+  if (/bitbucket/.test(remote.hostname)) {
     return `${remote.url}/compare/${to}%0D${from}`
   }
   return `${remote.url}/compare/${from}...${to}`

src/remote.js

@@ -12,8 +12,15 @@ export async function fetchRemote (name) {
   const remote = parseRepoURL(remoteURL)
   const protocol = remote.protocol === 'http:' ? 'http:' : 'https:'
   const hostname = remote.hostname || remote.host
+  let repo = remote.repo
+
+  if (/gitlab/.test(hostname) && /\.git$/.test(remote.branch)) {
+    // Support gitlab subgroups
+    repo = `${remote.repo}/${remote.branch.replace(/\.git$/, '')}`
+  }
+
   return {
     hostname,
-    url: `${protocol}//${hostname}/${remote.repo}`
+    url: `${protocol}//${hostname}/${repo}`
   }
 }

test/commits.js

@@ -222,6 +222,19 @@ describe('getMerge', () => {
         href: 'https://gitlab.com/user/repo/merge_requests/15007'
       })
     })
+
+    it('parses a merge for subgroups', () => {
+      const message = 'Merge branch \'branch\' into \'master\'\n\nMemoize GitLab logger to reduce open file descriptors\n\nCloses gitlab-ee#3664\n\nSee merge request user/repo/subgroup!15007'
+      const remote = {
+        hostname: 'gitlab.com',
+        url: 'https://gitlab.com/user/repo/subgroup'
+      }
+      expect(getMerge(message, remote)).to.deep.equal({
+        id: '15007',
+        message: 'Memoize GitLab logger to reduce open file descriptors',
+        href: 'https://gitlab.com/user/repo/subgroup/merge_requests/15007'
+      })
+    })
   })
 
   describe('BitBucket', () => {

test/remote.js

@@ -29,6 +29,20 @@ const TEST_DATA = [
     remote: '[email protected]:user/repo.git',
     expected: remotes.gitlab
   },
+  {
+    remote: 'https://gitlab.com/user/repo/subgroup.git',
+    expected: {
+      hostname: 'gitlab.com',
+      url: 'https://gitlab.com/user/repo/subgroup'
+    }
+  },
+  {
+    remote: '[email protected]:user/repo/subgroup.git',
+    expected: {
+      hostname: 'gitlab.com',
+      url: 'https://gitlab.com/user/repo/subgroup'
+    }
+  },
   {
     remote: 'https://bitbucket.org/user/repo',
     expected: remotes.bitbucket