Merge branch 'master' into feature/multi-level-container-registry-images

* master: (94 commits)
  Merge branch 'open-redirect-fix-continue-to' into 'security'
  Merge branch 'open-redirect-host-fix' into 'security'
  Merge branch 'path-disclosure-proj-import-export' into 'security'
  Merge branch '29364-private-projects-mr-fix'
  Merge branch '30125-markdown-security'
  Issue title realtime
  Update CHANGELOG.md for 8.16.9
  Update CHANGELOG.md for 8.17.5
  Update CHANGELOG.md for 9.0.4
  Add "search" optional param and docs for V4
  Use PDFLab to render PDFs in GitLab
  Separate Scala from Java in CI examples
  Fix broken link
  Reorganize CI examples, add more links
  Refactor CI index page
  Remove deprecated field from workhorse response
  Use gitlab-workhorse 1.4.3
  Document how ETag caching middleware handles query parameters
  Make group skip validation in the frontend
  Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware
  ...

5 files changed, 32 insertions, 16 deletions

diff --git a/config/application.rb b/config/application.rb
index f9f01b66473..f2ecc4ce77c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -150,6 +150,7 @@ module Gitlab
 
     # This is needed for gitlab-shell
     ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
+    ENV['GIT_TERMINAL_PROMPT'] = '0'
 
     config.generators do |g|
       g.factory_girl false
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 072ed8a3864..fdba1f6541e 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -326,3 +326,21 @@
     :why: https://github.com/domenic/opener/blob/1.4.3/LICENSE.txt
     :versions: []
     :when: 2017-02-21 22:33:41.729629000 Z
+- - :approve
+  - jszip
+  - :who: Phil Hughes
+    :why: https://github.com/Stuk/jszip/blob/master/LICENSE.markdown
+    :versions: []
+    :when: 2017-04-05 10:38:46.275721000 Z
+- - :approve
+  - jszip-utils
+  - :who: Phil Hughes
+    :why: https://github.com/Stuk/jszip-utils/blob/master/LICENSE.markdown
+    :versions: []
+    :when: 2017-04-05 10:39:32.676232000 Z
+- - :approve
+  - pako
+  - :who: Phil Hughes
+    :why: https://github.com/nodeca/pako/blob/master/LICENSE
+    :versions: []
+    :when: 2017-04-05 10:43:45.897720000 Z
diff --git a/config/initializers/8_gitaly.rb b/config/initializers/8_gitaly.rb
index c7f27c78535..42ec7240b0f 100644
--- a/config/initializers/8_gitaly.rb
+++ b/config/initializers/8_gitaly.rb
@@ -2,17 +2,5 @@ require 'uri'
 
 # Make sure we initialize our Gitaly channels before Sidekiq starts multi-threaded execution.
 if Gitlab.config.gitaly.enabled || Rails.env.test?
-  Gitlab.config.repositories.storages.each do |name, params|
-    address = params['gitaly_address']
-
-    unless address.present?
-      raise "storage #{name.inspect} is missing a gitaly_address"
-    end
-
-    unless URI(address).scheme.in?(%w(tcp unix))
-      raise "Unsupported Gitaly address: #{address.inspect}"
-    end
-
-    Gitlab::GitalyClient.configure_channel(name, address)
-  end
+  Gitlab::GitalyClient.configure_channels
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 757e1852da4..e38f0537143 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -258,6 +258,7 @@ constraints(ProjectUrlConstrainer.new) do
           get :referenced_merge_requests
           get :related_branches
           get :can_create_branch
+          get :rendered_title
         end
         collection do
           post  :bulk_update
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 70d98b022c1..69d8c5640f7 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -23,7 +23,6 @@ var config = {
     main:                 './main.js',
     blob:                 './blob_edit/blob_bundle.js',
     boards:               './boards/boards_bundle.js',
-    simulate_drag:        './test_utils/simulate_drag.js',
     cycle_analytics:      './cycle_analytics/cycle_analytics_bundle.js',
     commit_pipelines:     './commit/pipelines/pipelines_bundle.js',
     diff_notes:           './diff_notes/diff_notes_bundle.js',
@@ -38,6 +37,8 @@ var config = {
     monitoring:           './monitoring/monitoring_bundle.js',
     network:              './network/network_bundle.js',
     notebook_viewer:      './blob/notebook_viewer.js',
+    sketch_viewer:        './blob/sketch_viewer.js',
+    pdf_viewer:           './blob/pdf_viewer.js',
     profile:              './profile/profile_bundle.js',
     protected_branches:   './protected_branches/protected_branches_bundle.js',
     snippet:              './snippet/snippet_bundle.js',
@@ -45,6 +46,7 @@ var config = {
     u2f:                  ['vendor/u2f'],
     users:                './users/users_bundle.js',
     vue_pipelines:        './vue_pipelines_index/index.js',
+    issue_show:           './issue_show/index.js',
   },
 
   output: {
@@ -53,7 +55,7 @@ var config = {
     filename: IS_PRODUCTION ? '[name].[chunkhash].bundle.js' : '[name].bundle.js'
   },
 
-  devtool: 'inline-source-map',
+  devtool: 'cheap-module-source-map',
 
   module: {
     rules: [
@@ -65,7 +67,11 @@ var config = {
       {
         test: /\.svg$/,
         use: 'raw-loader'
-      }
+      }, {
+        test: /\.(worker.js|pdf)$/,
+        exclude: /node_modules/,
+        loader: 'file-loader',
+      },
     ]
   },
 
@@ -107,6 +113,7 @@ var config = {
         'issuable',
         'merge_conflicts',
         'notebook_viewer',
+        'pdf_viewer',
         'vue_pipelines',
       ],
       minChunks: function(module, count) {
@@ -164,6 +171,7 @@ if (IS_PRODUCTION) {
 }
 
 if (IS_DEV_SERVER) {
+  config.devtool = 'cheap-module-eval-source-map';
   config.devServer = {
     port: DEV_SERVER_PORT,
     headers: { 'Access-Control-Allow-Origin': '*' },