Merge branch 'ce-to-ee-2018-06-22' into 'master'

CE upstream - 2018-06-22 18:21 UTC

Closes gitaly#222

See merge request gitlab-org/gitlab-ee!6251

Gemfile.lock

@@ -896,7 +896,7 @@ GEM
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)

app/assets/stylesheets/bootstrap_migration.scss

@@ -173,6 +173,12 @@ table {
   display: none;
 }
 
+h3.popover-header {
+  // Default bootstrap popovers use <h3>
+  // which we default to having a top margin
+  margin-top: 0;
+}
+
 // Add to .label so that old system notes that are saved to the db
 // will still receive the correct styling
 .badge,

app/assets/stylesheets/pages/boards.scss

@@ -335,10 +335,6 @@
   &.is-active,
   &.is-active .board-card-assignee:hover a {
     background-color: $row-hover;
-
-    &:first-child:not(:only-child) {
-      box-shadow: -10px 0 10px 1px $row-hover;
-    }
   }
 
   .badge {

changelogs/unreleased/fix-boards-issue-highlight.yml

+---
+title: Fix boards issue highlight
+merge_request: 20063
+author: George Tsiolis
+type: changed

lib/gitlab/git/commit.rb

@@ -381,15 +381,11 @@ module Gitlab
       # empty repo. See Repository#diff for keys allowed in the +options+
       # hash.
       def diff_from_parent(options = {})
-        Gitlab::GitalyClient.migrate(:commit_raw_diffs) do |is_enabled|
-          if is_enabled
-            @repository.gitaly_commit_client.diff_from_parent(self, options)
-          else
-            rugged_diff_from_parent(options)
-          end
-        end
+        @repository.gitaly_commit_client.diff_from_parent(self, options)
       end
 
+      # Not to be called directly, but right now its used for tests and in old
+      # migrations
       def rugged_diff_from_parent(options = {})
         options ||= {}
         break_rewrites = options[:break_rewrites]