Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-26

# Conflicts:
#	app/assets/javascripts/vue_shared/components/svg_gradient.vue
#	spec/requests/api/members_spec.rb
#	yarn.lock

[ci skip]

app/assets/javascripts/vue_shared/components/svg_gradient.vue

@@ -4,16 +4,22 @@ export default {
     colors: {
       type: Array,
       required: true,
+<<<<<<< HEAD
       validator(value) {
         return value.length === 2;
       },
+=======
+>>>>>>> upstream/master
     },
     opacity: {
       type: Array,
       required: true,
+<<<<<<< HEAD
       validator(value) {
         return value.length === 2;
       },
+=======
+>>>>>>> upstream/master
     },
     identifierName: {
       type: String,

app/assets/stylesheets/pages/diff.scss

@@ -16,6 +16,7 @@
 
     svg {
       vertical-align: middle;
+      top: -1px;
     }
   }
 

app/assets/stylesheets/pages/issuable.scss

@@ -856,18 +856,6 @@
     }
   }
 
-  .meter-container {
-    background: $border-gray-light;
-    border-radius: 3px;
-
-    .meter-fill {
-      max-width: 100%;
-      height: 5px;
-      border-radius: 3px;
-      background: $gl-primary;
-    }
-  }
-
   .compare-display-container {
     display: flex;
     justify-content: space-between;

spec/requests/api/members_spec.rb

@@ -254,6 +254,7 @@ describe API::Members do
     end
   end
 
+<<<<<<< HEAD
   ## EE specific
   shared_examples 'POST /projects/:id/members with the project group membership locked' do
     context 'project in a group' do
@@ -271,6 +272,8 @@ describe API::Members do
   end
   ## EE specific
 
+=======
+>>>>>>> upstream/master
   shared_examples 'PUT /:source_type/:id/members/:user_id' do |source_type|
     context "with :source_type == #{source_type.pluralize}" do
       it_behaves_like 'a 404 response when source is private' do
@@ -411,10 +414,13 @@ describe API::Members do
     let(:source) { project }
   end
 
+<<<<<<< HEAD
   ## EE specific
   it_behaves_like 'POST /projects/:id/members with the project group membership locked'
   ## EE specific
 
+=======
+>>>>>>> upstream/master
   it_behaves_like 'POST /:source_type/:id/members', 'group' do
     let(:source) { group }
   end

yarn.lock

@@ -1349,8 +1349,13 @@ bootstrap-vue@^2.0.0-rc.11:
     vue-functional-data-merge "^2.0.5"
 
 bootstrap@^4.1.1:
+<<<<<<< HEAD
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+=======
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.2.tgz#aee2a93472e61c471fc79fb475531dcbc87de326"
+>>>>>>> upstream/master
 
 bootstrap@~4.1.1:
   version "4.1.1"
@@ -2157,7 +2162,11 @@ d3-dsv@1, d3-dsv@1.0.8:
     iconv-lite "0.4"
     rw "1"
 
+<<<<<<< HEAD
 d3-ease@1, d3-ease@1.0.3, d3-ease@^1.0.3:
+=======
+d3-ease@1, d3-ease@1.0.3:
+>>>>>>> upstream/master
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"
 
@@ -2255,7 +2264,11 @@ d3-timer@1, d3-timer@1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531"
 
+<<<<<<< HEAD
 d3-transition@1, d3-transition@1.1.1, d3-transition@^1.1.1:
+=======
+d3-transition@1, d3-transition@1.1.1:
+>>>>>>> upstream/master
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039"
   dependencies:
@@ -3920,7 +3933,11 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
+<<<<<<< HEAD
 iconv-lite@0.4, iconv-lite@0.4.23, iconv-lite@^0.4.22, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+=======
+iconv-lite@0.4:
+>>>>>>> upstream/master
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
@@ -3934,6 +3951,15 @@ iconv-lite@0.4.19, iconv-lite@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+<<<<<<< HEAD
+=======
+iconv-lite@0.4.23, iconv-lite@^0.4.22, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+>>>>>>> upstream/master
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"