Merge branch 'master-ce' into scheduled-manual-jobs

4 files changed, 22 insertions, 41 deletions

diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 664035831a5..62760ffee3a 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -585,3 +585,17 @@
       and are therefore exempt.
     :versions: []
     :when: 2018-08-30 12:06:35.668181000 Z
+- - :approve
+  - caniuse-lite
+  - :who: Mike Greiling
+    :why: CC-BY-4.0 license. Tool only used during build process, code is not present
+      in compiled/distributed product so attribution not needed.
+    :versions: []
+    :when: 2018-10-02 19:23:11.221660000 Z
+- - :approve
+  - node-releases
+  - :who: Mike Greiling
+    :why: CC-BY-4.0 license. Tool only used during build process, code is not present
+      in compiled/distributed product so attribution not needed.
+    :versions: []
+    :when: 2018-10-02 19:23:54.840151000 Z
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb
index 4d8d35bf6cf..eccf82ab8dc 100644
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -3,7 +3,6 @@
 # that we can stub it for testing, as it is only called when metrics are
 # enabled.
 #
-# rubocop:disable Metrics/AbcSize
 def instrument_classes(instrumentation)
   instrumentation.instrument_instance_methods(Gitlab::Shell)
 
@@ -48,16 +47,6 @@ def instrument_classes(instrumentation)
   instrumentation.instrument_methods(Premailer::Adapter::Nokogiri)
   instrumentation.instrument_instance_methods(Premailer::Adapter::Nokogiri)
 
-  [
-    :Blame, :Branch, :BranchCollection, :Blob, :Commit, :Diff, :Repository,
-    :Tag, :TagCollection, :Tree
-  ].each do |name|
-    const = Rugged.const_get(name)
-
-    instrumentation.instrument_methods(const)
-    instrumentation.instrument_instance_methods(const)
-  end
-
   instrumentation.instrument_methods(Banzai::Renderer)
   instrumentation.instrument_methods(Banzai::Querying)
 
@@ -101,7 +90,6 @@ def instrument_classes(instrumentation)
   # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159
   instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits)
 end
-# rubocop:enable Metrics/AbcSize
 
 # With prometheus enabled by default this breaks all specs
 # that stubs methods using `any_instance_of` for the models reloaded here.
diff --git a/config/initializers/gollum.rb b/config/initializers/gollum.rb
deleted file mode 100644
index ea9cc151a57..00000000000
--- a/config/initializers/gollum.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# WARNING changes in this file must be manually propagated to gitaly-ruby.
-#
-# https://gitlab.com/gitlab-org/gitaly/blob/master/ruby/lib/gitlab/gollum.rb
-
-module Gollum
-  GIT_ADAPTER = "rugged".freeze
-end
-require "gollum-lib"
-
-module Gollum
-  class Page
-    def text_data(encoding = nil)
-      data = if raw_data.respond_to?(:encoding)
-               raw_data.force_encoding(encoding || Encoding::UTF_8)
-             else
-               raw_data
-             end
-
-      Gitlab::EncodingHelper.encode!(data)
-    end
-  end
-end
-
-Rails.application.configure do
-  config.after_initialize do
-    Gollum::Page.per_page = Kaminari.config.default_per_page
-  end
-end
diff --git a/config/karma.config.js b/config/karma.config.js
index 74dc5c13c70..e1d7c30b1c2 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -22,6 +22,13 @@ webpackConfig.optimization.splitChunks = false;
 // use quicker sourcemap option
 webpackConfig.devtool = 'cheap-inline-source-map';
 
+// set BABEL_ENV to indicate when we're running code coverage
+webpackConfig.plugins.push(
+  new webpack.DefinePlugin({
+    'process.env.BABEL_ENV': JSON.stringify(process.env.BABEL_ENV || process.env.NODE_ENV || null),
+  })
+);
+
 const specFilters = argumentsParser
   .option(
     '-f, --filter-spec [filter]',
@@ -84,7 +91,7 @@ module.exports = function(config) {
     basePath: ROOT_PATH,
     browsers: ['ChromeHeadlessCustom'],
     client: {
-      color: !process.env.CI
+      color: !process.env.CI,
     },
     customLaunchers: {
       ChromeHeadlessCustom: {