Merge branch 'master' into 22643-manual-job-page

* master: (22 commits)
  Extend Cluster Applications to allow installation of Prometheus
  Docs: move article LDAP-CE to its topic-related folder
  Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison
  Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788
  Execute project hooks and services after commit when moving an issue
  Use relative URLs when linking to uploaded files
  Use gitlab-styles
  Clarify Auto DevOps pipelines
  Make webpack fail for missing exports
  Update VERSION to 10.4.0-pre
  Update CHANGELOG.md for 10.3.0
  Explictly require Gitlab::Utils in ProjectFeaturesCompatibility
  Add note about using the term GPG for all related implementations
  Add index on namespaces lower(name) for UsersController#exists
  docs: fix a typo in LFS documentation
  Fix prometheus arg in prometheus.yml
  Update Dependencies
  It should escape spaces to %20 rather than +
  Replaced the remaining code-fork icons
  code-fork replacements
  ...

5 files changed, 20 insertions, 2 deletions

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 735fc4babd7..2f3a80daa90 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -16,6 +16,10 @@
       .commit-sha,
       .commit-info {
         margin-left: 4px;
+
+        .fork-svg {
+          margin-right: 4px;
+        }
       }
 
       .ref-name {
@@ -79,7 +83,7 @@
     }
 
     .limit-icon {
-      margin: 0 8px;
+      margin: 0 4px;
     }
 
     .limit-message {
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss
index 88d44131d5b..7b8ee026357 100644
--- a/app/assets/stylesheets/pages/clusters.scss
+++ b/app/assets/stylesheets/pages/clusters.scss
@@ -6,7 +6,7 @@
 
 .cluster-applications-table {
   // Wait for the Vue to kick-in and render the applications block
-  min-height: 302px;
+  min-height: 400px;
 }
 
 .clusters-dropdown-menu {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index e75a35d78ad..f887a11004f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -723,3 +723,7 @@
     font-size: 16px;
   }
 }
+
+.fork-sprite {
+  margin-right: -5px;
+}
diff --git a/app/assets/stylesheets/pages/pipeline_schedules.scss b/app/assets/stylesheets/pages/pipeline_schedules.scss
index 7e2297c283f..b698a4f9afa 100644
--- a/app/assets/stylesheets/pages/pipeline_schedules.scss
+++ b/app/assets/stylesheets/pages/pipeline_schedules.scss
@@ -39,6 +39,10 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+
+    svg {
+      vertical-align: middle;
+    }
   }
 
   .next-run-cell {
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 9805fc4f882..05c1033c5f7 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -143,6 +143,12 @@
       fill: $gl-text-color-secondary;
     }
 
+    .sprite {
+      width: 12px;
+      height: 12px;
+      fill: $gl-text-color;
+    }
+
     .fa {
       font-size: 12px;
       color: $gl-text-color;