Merge branch 'ce-to-ee-2018-01-24' into 'master'

CE upstream - Wednesday

Closes gitlab-runner#2652

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

changelogs/unreleased/42251-explicit-timezone-for-karma.yml

+---
+title: Set timezone for karma to UTC
+merge_request: 16602
+author: Takuya Noguchi
+type: other

config/karma.config.js

@@ -18,6 +18,8 @@ webpackConfig.devtool = 'cheap-inline-source-map';
 
 // Karma configuration
 module.exports = function(config) {
+  process.env.TZ = 'Etc/UTC';
+
   var progressReporter = process.env.CI ? 'mocha' : 'progress';
 
   var karmaConfig = {

doc/ci/yaml/README.md

@@ -1293,7 +1293,7 @@ to the CI pipeline:
 ```yaml
 variables:
   GIT_STRATEGY: clone
-  GIT_CHECKOUT: false
+  GIT_CHECKOUT: "false"
 script:
   - git checkout master
   - git merge $CI_BUILD_REF_NAME

spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb

@@ -7,6 +7,10 @@ describe Gitlab::BackgroundMigration::PopulateMergeRequestMetricsWithEventsData,
       .to receive(:commits_count=).and_return(nil)
   end
 
+  after do
+    [MergeRequest, MergeRequestDiff].each(&:reset_column_information)
+  end
+
   describe '#perform' do
     let(:mr_with_event) { create(:merge_request) }
     let!(:merged_event) { create(:event, :merged, target: mr_with_event) }