Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration

* upstream/master: (234 commits)
  Improve performance of User Agent Detail
  Fix some grammar in the API docs
  Remove shared example for pagination
  API: Use POST to (un)block a user
  API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`
  Use grape validation for dates
  Change wording for LDAP doc that was moved to a new location
  API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`
  Download snippets with LF line-endings by default
  utilize pre-minified Vue in production since no CJS distribution is available
  Prevent project team from being truncated too early during project destruction
  loading icon sometimes toggled alongside MR pipeline contents
  fix failed spec because haml_lint
  fix incorrect sidekiq concurrency count in admin background page
  exclude rpc_pipefs from system disc info
  Fix wrong line ending [ci-skip]
  fix overlooked window binding in spec files
  remove imports loader
  replace implicit this == window with explicit binding
  Todo done clicking is kind of unusable.
  ...

8 files changed, 26 insertions, 32 deletions

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index cc1af77a1de..a82ff605a70 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -76,14 +76,6 @@ production: &base
 
     # default_can_create_group: false  # default: true
     # username_changing_enabled: false # default: true - User can change her username/namespace
-    ## Default theme ID
-    ##   1 - Graphite
-    ##   2 - Charcoal
-    ##   3 - Green
-    ##   4 - Gray
-    ##   5 - Violet
-    ##   6 - Blue
-    # default_theme: 2 # default: 2
 
     ## Automatic issue closing
     # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
@@ -611,4 +603,4 @@ test:
         admin_group: ''
 
 staging:
-  <<: *base
\ No newline at end of file
+  <<: *base
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ab59394cb0c..3f716dd8833 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -183,7 +183,6 @@ Settings['gitlab'] ||= Settingslogic.new({})
 Settings.gitlab['default_projects_limit'] ||= 10
 Settings.gitlab['default_branch_protection'] ||= 2
 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
-Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil?
 Settings.gitlab['host']       ||= ENV['GITLAB_HOST'] || 'localhost'
 Settings.gitlab['ssh_host']   ||= Settings.gitlab.host
 Settings.gitlab['https']        = false if Settings.gitlab['https'].nil?
diff --git a/config/initializers/4_ci_app.rb b/config/initializers/4_ci_app.rb
deleted file mode 100644
index d252e403102..00000000000
--- a/config/initializers/4_ci_app.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module GitlabCi
-  VERSION = Gitlab::VERSION
-  REVISION = Gitlab::REVISION
-
-  def self.config
-    Settings
-  end
-end
diff --git a/config/karma.config.js b/config/karma.config.js
index 5b472780aed..2f3cc932413 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -2,6 +2,17 @@ var path = require('path');
 var webpackConfig = require('./webpack.config.js');
 var ROOT_PATH = path.resolve(__dirname, '..');
 
+// add coverage instrumentation to babel config
+if (webpackConfig && webpackConfig.module && webpackConfig.module.rules) {
+  var babelConfig = webpackConfig.module.rules.find(function (rule) {
+    return rule.loader === 'babel-loader';
+  });
+
+  babelConfig.options = babelConfig.options || {};
+  babelConfig.options.plugins = babelConfig.options.plugins || [];
+  babelConfig.options.plugins.push('istanbul');
+}
+
 // Karma configuration
 module.exports = function(config) {
   var progressReporter = process.env.CI ? 'mocha' : 'progress';
diff --git a/config/routes/dashboard.rb b/config/routes/dashboard.rb
index fb20c63bc63..adc3ad207cc 100644
--- a/config/routes/dashboard.rb
+++ b/config/routes/dashboard.rb
@@ -14,6 +14,9 @@ resource :dashboard, controller: 'dashboard', only: [] do
       collection do
         delete :destroy_all
       end
+      member do
+        patch :restore
+      end
     end
 
     resources :projects, only: [:index] do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 2ac98cf3842..84f123ff717 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -156,6 +156,10 @@ constraints(ProjectUrlConstrainer.new) do
           get :terminal
           get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil }
         end
+
+        collection do
+          get :folder, path: 'folders/:id'
+        end
       end
 
       resource :cycle_analytics, only: [:show]
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 56bf4e6b1de..97620cc9c7f 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -21,7 +21,7 @@
   - [post_receive, 5]
   - [merge, 5]
   - [update_merge_requests, 3]
-  - [process_commit, 2]
+  - [process_commit, 3]
   - [new_note, 2]
   - [build, 2]
   - [pipeline, 2]
diff --git a/config/webpack.config.js b/config/webpack.config.js
index e63775e43ce..515569b2e97 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -22,6 +22,7 @@ var config = {
     commit_pipelines:     './commit/pipelines/pipelines_bundle.js',
     diff_notes:           './diff_notes/diff_notes_bundle.js',
     environments:         './environments/environments_bundle.js',
+    environments_folder:  './environments/folder/environments_folder_bundle.js',
     filtered_search:      './filtered_search/filtered_search_bundle.js',
     graphs:               './graphs/graphs_bundle.js',
     issuable:             './issuable/issuable_bundle.js',
@@ -54,18 +55,11 @@ var config = {
         exclude: /(node_modules|vendor\/assets)/,
         loader: 'babel-loader',
         options: {
-          plugins: IS_PRODUCTION ? [] : ['istanbul'],
           presets: [
             ["es2015", {"modules": false}],
             'stage-2'
           ]
         }
-      },
-      {
-        test: /\.(js|es6)$/,
-        exclude: /node_modules/,
-        loader: 'imports-loader',
-        options: 'this=>window'
       }
     ]
   },
@@ -80,9 +74,6 @@ var config = {
       modules: false,
       assets: true
     }),
-    new CompressionPlugin({
-      asset: '[path].gz[query]',
-    }),
     new webpack.IgnorePlugin(/moment/, /pikaday/),
   ],
 
@@ -93,8 +84,7 @@ var config = {
       'bootstrap/js':   'bootstrap-sass/assets/javascripts/bootstrap',
       'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
-      'vue$':           'vue/dist/vue.js',
-      'vue-resource$':  'vue-resource/dist/vue-resource.js'
+      'vue$':           IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js',
     }
   }
 }
@@ -102,7 +92,7 @@ var config = {
 if (IS_PRODUCTION) {
   config.devtool = 'source-map';
   config.plugins.push(
-    new webpack.NoErrorsPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
     new webpack.LoaderOptionsPlugin({
       minimize: true,
       debug: false
@@ -112,6 +102,9 @@ if (IS_PRODUCTION) {
     }),
     new webpack.DefinePlugin({
       'process.env': { NODE_ENV: JSON.stringify('production') }
+    }),
+    new CompressionPlugin({
+      asset: '[path].gz[query]',
     })
   );
 }