Merge remote-tracking branch 'dev/15-5-stable' into 15-5-stable

5 files changed, 42 insertions, 16 deletions

diff --git a/app/views/projects/artifacts/_file_navigation.html.haml b/app/views/projects/artifacts/_file_navigation.html.haml
new file mode 100644
index 00000000000..e9109451a69
--- /dev/null
+++ b/app/views/projects/artifacts/_file_navigation.html.haml
@@ -0,0 +1,12 @@
+.nav-block
+  %ul.breadcrumb.repo-breadcrumb
+    %li.breadcrumb-item
+      = link_to _('Artifacts'), browse_project_job_artifacts_path(project, build)
+    - path_breadcrumbs do |title, breadcrumb|
+      - title = truncate(title, length: 40)
+      %li.breadcrumb-item
+        - if path == breadcrumb
+          = link_to file_project_job_artifacts_path(project, build, breadcrumb) do
+            %strong= title
+        - else
+          = link_to title, browse_project_job_artifacts_path(project, build, breadcrumb)
diff --git a/app/views/projects/artifacts/_tree_file.html.haml b/app/views/projects/artifacts/_tree_file.html.haml
index 03d35c1c989..e120975a8f9 100644
--- a/app/views/projects/artifacts/_tree_file.html.haml
+++ b/app/views/projects/artifacts/_tree_file.html.haml
@@ -1,13 +1,15 @@
 - blob = file.blob
-- path_to_file = file_project_job_artifacts_path(@project, @build, path: file.path)
 - external_link = blob.external_link?(@build)
+- if external_link
+  - path_to_file = external_file_project_job_artifacts_path(@project, @build, path: file.path)
+- else
+  - path_to_file = file_project_job_artifacts_path(@project, @build, path: file.path)
 
 %tr.tree-item.js-artifact-tree-row{ data: { link: path_to_file, external_link: "#{external_link}" } }
   %td.tree-item-file-name
     = tree_icon('file', blob.mode, blob.name)
     - if external_link
-      = link_to path_to_file, class: 'tree-item-file-external-link js-artifact-tree-tooltip str-truncated',
-          target: '_blank', rel: 'noopener noreferrer', title: _('Opens in a new window') do
+      = link_to path_to_file, class: 'tree-item-file-external-link js-artifact-tree-tooltip str-truncated' do
         %span>= blob.name
       = sprite_icon('external-link', css_class: 'js-artifact-tree-external-icon')
     - else
diff --git a/app/views/projects/artifacts/external_file.html.haml b/app/views/projects/artifacts/external_file.html.haml
new file mode 100644
index 00000000000..a014d134e31
--- /dev/null
+++ b/app/views/projects/artifacts/external_file.html.haml
@@ -0,0 +1,15 @@
+- page_title @path, _('Artifacts'), "#{@build.name} (##{@build.id})", _('Jobs')
+
+= render "projects/jobs/header"
+
+.tree-holder
+  = render 'projects/artifacts/file_navigation', project: @project, build: @build, path: @path
+
+  %h2= _("You are being redirected away from GitLab")
+  %p= _("This page is hosted on GitLab pages but contains user-generated content and may contain malicious code. Do not accept unless you trust the author and source.")
+
+  = link_to @blob.external_url(@project, @build),
+      @blob.external_url(@project, @build),
+      target: '_blank',
+      title: _('Opens in a new window'),
+      rel: 'noopener noreferrer'
diff --git a/app/views/projects/artifacts/file.html.haml b/app/views/projects/artifacts/file.html.haml
index e16e3ef266d..5b9e5ad584f 100644
--- a/app/views/projects/artifacts/file.html.haml
+++ b/app/views/projects/artifacts/file.html.haml
@@ -4,19 +4,7 @@
 = render "projects/jobs/header"
 
 .tree-holder
-  .nav-block
-    %ul.breadcrumb.repo-breadcrumb
-      %li.breadcrumb-item
-        = link_to 'Artifacts', browse_project_job_artifacts_path(@project, @build)
-      - path_breadcrumbs do |title, path|
-        - title = truncate(title, length: 40)
-        %li.breadcrumb-item
-          - if path == @path
-            = link_to file_project_job_artifacts_path(@project, @build, path) do
-              %strong= title
-          - else
-            = link_to title, browse_project_job_artifacts_path(@project, @build, path)
-
+  = render 'projects/artifacts/file_navigation', project: @project, build: @build, path: @path
 
   %article.file-holder
     - blob = @entry.blob
diff --git a/app/views/sandbox/swagger.html.erb b/app/views/sandbox/swagger.html.erb
new file mode 100644
index 00000000000..ab3c36e5f4a
--- /dev/null
+++ b/app/views/sandbox/swagger.html.erb
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  <%= webpack_bundle_tag("sandboxed_swagger") %>
+  </head>
+  <body>
+    <div id="swagger-ui"></div>
+  </body>
+</html>