Merge branch 'master' into bootstrap4

6 files changed, 30 insertions, 7 deletions

diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index 12005891016..07f0ef98f44 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -27,11 +27,11 @@
     .col-sm-10
       = f.color_field :font, class: "form-control"
   .form-group.row
-    = f.label :starts_at, class: 'col-form-label col-sm-2'
+    = f.label :starts_at, _("Starts at (UTC)"), class: 'col-form-label col-sm-2'
     .col-sm-10.datetime-controls
       = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline'
   .form-group.row
-    = f.label :ends_at, class: 'col-form-label col-sm-2'
+    = f.label :ends_at, _("Ends at (UTC)"), class: 'col-form-label col-sm-2'
     .col-sm-10.datetime-controls
       = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'
   .form-actions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 44eb0c89f2f..a6cd39edcf0 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -33,7 +33,7 @@
         = tag
   %td
     - if runner.contacted_at
-      #{time_ago_in_words(runner.contacted_at)} ago
+      = time_ago_with_tooltip runner.contacted_at
     - else
       Never
   %td.admin-runner-btn-group-cell
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 1c5b4aecabb..9a3a03a7671 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -121,7 +121,7 @@
                 %tr
                   %td.shortcut
                     .key g
-                    .key e
+                    .key v
                   %td
                     Go to the project's activity feed
                 %tr
@@ -175,6 +175,18 @@
                 %tr
                   %td.shortcut
                     .key g
+                    .key e
+                  %td
+                    Go to environments
+                %tr
+                  %td.shortcut
+                    .key g
+                    .key k
+                  %td
+                    Go to kubernetes
+                %tr
+                  %td.shortcut
+                    .key g
                     .key s
                   %td
                     Go to snippets
@@ -219,6 +231,17 @@
                   %td.shortcut
                     .key y
                   %td Go to file permalink
+              %tbody
+                %tr
+                  %th
+                  %th Web IDE
+                %tr
+                  %td.shortcut
+                    - if browser.platform.mac?
+                      .key ⌘ p
+                    - else
+                      .key ctrl p
+                  %td Go to file
           .col-lg-4
             %table.shortcut-mappings
               %tbody.hidden-shortcut.network{ style: 'display:none' }
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index dae3f5d6518..0645d6d236c 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -154,7 +154,7 @@
         = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts]) do
           = link_to project_pipelines_path(@project), class: 'shortcuts-pipelines' do
             .nav-icon-container
-              = sprite_icon('pipeline')
+              = sprite_icon('rocket')
             %span.nav-item-name
               = _('CI / CD')
 
@@ -212,7 +212,7 @@
             - if project_nav_tab? :clusters
               - show_cluster_hint = show_gke_cluster_integration_callout?(@project)
               = nav_link(controller: [:clusters, :user, :gcp]) do
-                = link_to project_clusters_path(@project), title: _('Kubernetes'), class: 'shortcuts-cluster' do
+                = link_to project_clusters_path(@project), title: _('Kubernetes'), class: 'shortcuts-kubernetes' do
                   %span
                     = _('Kubernetes')
                   - if show_cluster_hint
diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml
index a603b1024eb..a603b1024eb 100755..100644
--- a/app/views/projects/forks/new.html.haml
+++ b/app/views/projects/forks/new.html.haml
diff --git a/app/views/shared/runners/show.html.haml b/app/views/shared/runners/show.html.haml
index ecadc21a458..e50b7fa68dd 100644
--- a/app/views/shared/runners/show.html.haml
+++ b/app/views/shared/runners/show.html.haml
@@ -66,6 +66,6 @@
       %td Last contact
       %td
         - if @runner.contacted_at
-          #{time_ago_in_words(@runner.contacted_at)} ago
+          = time_ago_with_tooltip @runner.contacted_at
         - else
           Never