Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 2 deletions

diff --git a/app/views/projects/environments/empty_logs.html.haml b/app/views/projects/environments/empty_logs.html.haml
new file mode 100644
index 00000000000..602dc908b75
--- /dev/null
+++ b/app/views/projects/environments/empty_logs.html.haml
@@ -0,0 +1,14 @@
+- page_title _('Pod logs')
+
+.row.empty-state
+  .col-sm-12
+    .svg-content
+      = image_tag 'illustrations/operations_log_pods_empty.svg'
+  .col-12
+    .text-content
+      %h4.text-center
+        = s_('Environments|No deployed environments')
+      %p.state-description.text-center
+        = s_('Logs|To see the pod logs, deploy your code to an environment.')
+      .text-center
+        = link_to s_('Environments|Learn about environments'), help_page_path('ci/environments'), class: 'btn btn-success'
diff --git a/app/views/projects/environments/empty.html.haml b/app/views/projects/environments/empty_metrics.html.haml
index 129dbbf4e56..dad93290fbd 100644
--- a/app/views/projects/environments/empty.html.haml
+++ b/app/views/projects/environments/empty_metrics.html.haml
@@ -7,8 +7,8 @@
   .col-12
     .text-content
       %h4.text-center
-        = s_('Metrics|No deployed environments')
+        = s_('Environments|No deployed environments')
       %p.state-description
         = s_('Metrics|Check out the CI/CD documentation on deploying to an environment')
       .text-center
-        = link_to s_("Metrics|Learn about environments"), help_page_path('ci/environments'), class: 'btn btn-success'
+        = link_to s_("Environments|Learn about environments"), help_page_path('ci/environments'), class: 'btn btn-success'
diff --git a/app/views/projects/error_tracking/details.html.haml b/app/views/projects/error_tracking/details.html.haml
new file mode 100644
index 00000000000..52e748fa88b
--- /dev/null
+++ b/app/views/projects/error_tracking/details.html.haml
@@ -0,0 +1,3 @@
+- page_title _('Error Details')
+
+#js-error_tracking{ data: error_details_data(@current_user, @project) }