Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-05

# Conflicts:
#	app/views/groups/labels/index.html.haml
#	doc/ci/yaml/README.md
#	lib/gitlab/ci/config.rb

[ci skip]

app/views/groups/labels/index.html.haml

 - page_title 'Labels'
 - can_admin_label = can?(current_user, :admin_label, @group)
+<<<<<<< HEAD
 - issuables = ['issues', 'merge requests'] + (@group&.feature_available?(:epics) ? ['epics'] : [])
+=======
+- issuables = ['issues', 'merge requests']
+>>>>>>> upstream/master
 - search = params[:search]
 
 - if can_admin_label

changelogs/unreleased/an-api-route-logger.yml

+---
+title: Add route information to lograge structured logging for API logs
+merge_request: 21487
+author:
+type: other

doc/ci/quick_start/README.md

@@ -7,7 +7,7 @@ projects.
 GitLab offers a [continuous integration][ci] service. If you
 [add a `.gitlab-ci.yml` file][yaml] to the root directory of your repository,
 and configure your GitLab project to use a [Runner], then each commit or
-push, triggers your CI [pipeline].
+push triggers your CI [pipeline].
 
 The `.gitlab-ci.yml` file tells the GitLab runner what to do. By default it runs
 a pipeline with three [stages]: `build`, `test`, and `deploy`. You don't need to

doc/ci/yaml/README.md

@@ -149,8 +149,11 @@ spinach:
   script: rake spinach
 ```
 
+<<<<<<< HEAD
 `extends` works across configuration files combined with [`include`](#include).
 
+=======
+>>>>>>> upstream/master
 ### `pages`
 
 `pages` is a special job that is used to upload static content to GitLab that

doc/install/kubernetes/gitlab_chart.md

@@ -133,6 +133,7 @@ Once your GitLab Chart is installed, configuration changes and chart updates
 should be done using `helm upgrade`:
 
 ```sh
+helm repo update
 helm upgrade --reuse-values gitlab gitlab/gitlab
 ```
 

lib/api/api.rb

@@ -15,6 +15,7 @@ module API
                   include: [
                     GrapeLogging::Loggers::FilterParameters.new,
                     GrapeLogging::Loggers::ClientEnv.new,
+                    Gitlab::GrapeLogging::Loggers::RouteLogger.new,
                     Gitlab::GrapeLogging::Loggers::UserLogger.new,
                     Gitlab::GrapeLogging::Loggers::QueueDurationLogger.new,
                     Gitlab::GrapeLogging::Loggers::PerfLogger.new

lib/gitlab/ci/config.rb

@@ -4,8 +4,11 @@ module Gitlab
     # Base GitLab CI Configuration facade
     #
     class Config
+<<<<<<< HEAD
       prepend EE::Gitlab::Ci::Config
 
+=======
+>>>>>>> upstream/master
       ConfigError = Class.new(StandardError)
 
       def initialize(config, opts = {})
@@ -66,8 +69,11 @@ module Gitlab
         @global.jobs_value
       end
 
+<<<<<<< HEAD
       private
 
+=======
+>>>>>>> upstream/master
       # 'opts' argument is used in EE see /ee/lib/ee/gitlab/ci/config.rb
       def build_config(config, opts = {})
         Loader.new(config).load!

lib/gitlab/grape_logging/loggers/route_logger.rb

+# frozen_string_literal: true
+
+# This grape_logging module (https://github.com/aserafin/grape_logging) makes it
+# possible to log the details of the action
+module Gitlab
+  module GrapeLogging
+    module Loggers
+      class RouteLogger < ::GrapeLogging::Loggers::Base
+        def parameters(request, _)
+          endpoint = request.env[Grape::Env::API_ENDPOINT]
+          route = endpoint&.route&.pattern&.origin
+
+          return {} unless route
+
+          { route: route }
+        rescue
+          # endpoint.route calls env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]
+          # but env[Grape::Env::GRAPE_ROUTING_ARGS] is nil in the case of a 405 response
+          # so we're rescuing exceptions and bailing out
+          {}
+        end
+      end
+    end
+  end
+end

lib/gitlab/middleware/multipart.rb

@@ -83,7 +83,7 @@ module Gitlab
 
         def open_file(params, key)
           allowed_paths = [
-            FileUploader.root,
+            ::FileUploader.root,
             Gitlab.config.uploads.storage_path,
             File.join(Rails.root, 'public/uploads/tmp')
           ]