Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-17

# Conflicts:
#	app/assets/stylesheets/pages/pipelines.scss

[ci skip]

app/assets/stylesheets/framework/lists.scss

@@ -285,7 +285,6 @@ ul.indent-list {
   padding: 10px 0 0 30px;
 }
 
-
 // Specific styles for tree list
 @keyframes spin-avatar {
   from { transform: rotate(0deg); }
@@ -430,18 +429,10 @@ ul.indent-list {
     &:first-child {
       border-top: 1px solid $white-normal;
     }
-
-    &:last-of-type {
-      .group-row-contents:not(:hover) {
-        border-bottom: 1px solid transparent;
-      }
-    }
   }
 
   .group-row-contents {
-    padding: 10px 10px 8px;
-    border-top: solid 1px transparent;
-    border-bottom: solid 1px $white-normal;
+    padding: $gl-padding-top;
 
     &:hover {
       border-color: $row-hover-border;

app/assets/stylesheets/pages/groups.scss

@@ -23,6 +23,10 @@
 
 .group-row {
   @include basic-list-stats;
+
+  .description p {
+    margin-bottom: 0;
+  }
 }
 
 .ldap-group-links {

app/assets/stylesheets/pages/issuable.scss

@@ -197,9 +197,21 @@
     }
 
     &.assignee {
-      .author_link:hover {
-        .author {
-          text-decoration: underline;
+      .author_link {
+        display: block;
+        padding-left: 42px;
+        position: relative;
+
+        &:hover {
+          .author {
+            text-decoration: underline;
+          }
+        }
+
+        .avatar {
+          left: 0;
+          position: absolute;
+          top: 0;
         }
       }
     }

app/assets/stylesheets/pages/pipelines.scss

@@ -392,8 +392,19 @@
       &:not(:first-child) {
         margin-left: 44px;
 
+<<<<<<< HEAD
         .left-connector {
           @include flat-connector-before;
+=======
+        .left-connector::before {
+          content: '';
+          position: absolute;
+          top: 48%;
+          left: -44px;
+          border-top: 2px solid $border-color;
+          width: 44px;
+          height: 1px;
+>>>>>>> upstream/master
         }
       }
     }

changelogs/unreleased/fix-assignee-name-wrap.yml

+---
+title: Wrapping problem on the issues page has been fixed
+merge_request:
+author:
+type: fixed

config/initializers/deprecations.rb

-if Gitlab.dev_env_or_com?
+if Rails.env.development? || ENV['GITLAB_LEGACY_PATH_LOG_MESSAGE']
   deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
 
   deprecator.behavior = -> (message, callstack) {