Merge remote-tracking branch 'upstream/master' into test-pg-mysql

* upstream/master: (43 commits)
  Update CHANGELOG.md for 9.0.1
  Support wider range of monitored environments with Prometheus
  Add changelog entry
  Don't include branch name in Knapsack report file
  Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost settings
  Fixed issue boards sidebar alignment
  Fixed alignment of tooltip on card assignee
  Stops triggering board sidebar when clicking avatar
  Get rid of a third N+1 query problem
  Get rid of second N+1 query problem
  Get rid of a first N+1 query problem
  Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes
  Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
  Use `:empty_project` where possible in service specs
  Adds entry about kebab case props in documentation
  Fix sub-nav highlighting for `Environments` and `Jobs` pages
  spread out webpack bundles per-line to reduce conflicts in EE
  Improve UX guide on tooltips
  Correct example value variable name.
  If wget fails, remove the empty file created
  ...

3 files changed, 11 insertions, 3 deletions

diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb
index 70177995356..764c067c6f0 100644
--- a/config/initializers/rspec_profiling.rb
+++ b/config/initializers/rspec_profiling.rb
@@ -7,7 +7,11 @@ module RspecProfilingExt
 
   module Git
     def branch
-      ENV['CI_COMMIT_REF_NAME'] || super
+      if ENV['CI_COMMIT_REF_NAME']
+        "#{defined?(Gitlab::License) ? 'ee' : 'ce'}:#{ENV['CI_COMMIT_REF_NAME']}"
+      else
+        super
+      end
     end
   end
 
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 823e0614aeb..7244f851869 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -166,7 +166,7 @@ constraints(ProjectUrlConstrainer.new) do
         end
 
         collection do
-          get :folder, path: 'folders/:id'
+          get :folder, path: 'folders/*id', constraints: { format: /(html|json)/ }
         end
       end
 
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 0859c8416c8..30e9e9c09b4 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -115,7 +115,11 @@ var config = {
     // create cacheable common library bundle for all d3 chunks
     new webpack.optimize.CommonsChunkPlugin({
       name: 'common_d3',
-      chunks: ['graphs', 'users', 'monitoring'],
+      chunks: [
+        'graphs',
+        'users',
+        'monitoring',
+      ],
     }),
 
     // create cacheable common library bundles