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

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

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

package.json

@@ -18,7 +18,7 @@
     "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
   },
   "dependencies": {
-    "@gitlab-org/gitlab-svgs": "^1.27.0",
+    "@gitlab-org/gitlab-svgs": "^1.28.0",
     "@gitlab-org/gitlab-ui": "1.0.5",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",

spec/services/git_push_service_spec.rb

@@ -246,11 +246,11 @@ describe GitPushService do
     end
 
     describe 'system hooks' do
-      let(:system_hook_service) { double() }
+      let(:system_hooks_service) { SystemHooksService.new }
 
       it "sends a system hook after pushing a branch" do
-        expect(SystemHooksService).to receive(:new).and_return(system_hook_service)
-        expect(system_hook_service).to receive(:execute_hooks).with(push_data, :push_hooks)
+        expect(SystemHooksService).to receive(:new).and_return(system_hooks_service)
+        expect(system_hooks_service).to receive(:execute_hooks).with(push_data, :push_hooks)
 
         execute_service(project, user, oldrev, newrev, ref)
       end

yarn.lock

@@ -78,10 +78,14 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.27.0":
+"@gitlab-org/gitlab-svgs@^1.23.0":
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.27.0.tgz#638e70399ebd59e503732177316bb9a18bf7a13f"
 
+"@gitlab-org/gitlab-svgs@^1.28.0":
+  version "1.28.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.28.0.tgz#f689dfd46504df0a75027d6dd4ea01a71cd46f88"
+
 "@gitlab-org/gitlab-ui@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.0.5.tgz#a64b402650494115c8b494a44b72c2d6fbf33fff"