Add latest changes from gitlab-org/gitlab@master

3 files changed, 30 insertions, 1 deletions

diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/link_dependencies.js b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/link_dependencies.js
index 597fc00a004..62036056700 100644
--- a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/link_dependencies.js
+++ b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/link_dependencies.js
@@ -1,11 +1,13 @@
 import packageJsonLinker from './utils/package_json_linker';
 import gemspecLinker from './utils/gemspec_linker';
 import godepsJsonLinker from './utils/godeps_json_linker';
+import gemfileLinker from './utils/gemfile_linker';
 
 const DEPENDENCY_LINKERS = {
   package_json: packageJsonLinker,
   gemspec: gemspecLinker,
   godeps_json: godepsJsonLinker,
+  gemfile: gemfileLinker,
 };
 
 /**
diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util.js b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util.js
index 49704421d6e..299059f62f7 100644
--- a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util.js
+++ b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util.js
@@ -1,7 +1,9 @@
 import { escape } from 'lodash';
 
 export const createLink = (href, innerText) =>
-  `<a href="${escape(href)}" rel="nofollow noreferrer noopener">${escape(innerText)}</a>`;
+  `<a href="${escape(href)}" target="_blank" rel="nofollow noreferrer noopener">${escape(
+    innerText,
+  )}</a>`;
 
 export const generateHLJSOpenTag = (type, delimiter = '&quot;') =>
   `<span class="hljs-${escape(type)}">${delimiter}`;
diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/gemfile_linker.js b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/gemfile_linker.js
new file mode 100644
index 00000000000..81389763f49
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/utils/gemfile_linker.js
@@ -0,0 +1,25 @@
+import { createLink, generateHLJSOpenTag } from './dependency_linker_util';
+
+const GEM_URL = 'https://rubygems.org/gems/';
+const GEM_STRING = 'gem </span>';
+const delimiter = '&#39;';
+const stringOpenTag = generateHLJSOpenTag('string', delimiter);
+
+const DEPENDENCY_REGEX = new RegExp(
+  /*
+   * Detects dependencies inside of content that is highlighted by Highlight.js
+   * Example: 'gem </span><span class="hljs-string">&#39;paranoia&#39;'
+   * Group 1 (packageName)     :  'paranoia'
+   */
+  `${GEM_STRING}${stringOpenTag}(.+?(?=${delimiter}))`,
+  'gm',
+);
+
+const handleReplace = (packageName) => {
+  const href = `${GEM_URL}${packageName}`;
+  const packageLink = createLink(href, packageName);
+  return `${GEM_STRING}${stringOpenTag}${packageLink}`;
+};
+export default (result) => {
+  return result.value.replace(DEPENDENCY_REGEX, (_, packageName) => handleReplace(packageName));
+};