1. 05 Jan, 2019 5 commits
    • Kamil Trzciński's avatar
      Merge branch 'sh-fix-multipart-uploads-failure' into 'master' · c53ba44c
      Kamil Trzciński authored
      Fix multipart attachments not uploading
      
      Closes gitlab-ee#9035
      
      See merge request gitlab-org/gitlab-ce!24170
      c53ba44c
    • Kamil Trzciński's avatar
      Merge branch '40473-api-support-for-kubernetes-integration' into 'master' · 647271c9
      Kamil Trzciński authored
      Add API Support for Kubernetes integration
      
      Closes #40473
      
      See merge request gitlab-org/gitlab-ce!23922
      647271c9
    • Kamil Trzciński's avatar
      Merge branch 'knative-rbac-check' into 'master' · 006da56c
      Kamil Trzciński authored
      Require Knative to be installed only on an RBAC kubernetes cluster
      
      See merge request gitlab-org/gitlab-ce!23807
      006da56c
    • Stan Hu's avatar
      Fix multipart attachments not uploading · 7d28e39f
      Stan Hu authored
      Mixing and matching the use of Rack::Request and ActionDispatch::Request
      in Rails 5 is bad, particularly if you have middleware that
      manipulates or accesses environment variables.
      
      `Gitlab::Middleware::Multipart` attempts to rewrite request parameters
      to the proper values (e.g. replacing `data_file` with
      `UploadedFile`). It does this by calling `Rack::Request#update_params`,
      which essentially updates `env['rack.request.form_hash']`.
      
      By changing to `ActionDispatch::Request`, the Go middleware was causing
      the request parameters to be stored inside
      `env['action_dispatch.request.request_parameters']`. Later calls to
      `Rack::Request#update_params` would not have any effect because it would
      attempt to update `env['rack.request.form_has']` instead of
      `env['action_dispatch.request.request_parameters']`. As a result, the
      controller still saw the old parameters.
      
      Since the Go middleware appears to be using `ActionDispatch::Request`
      for authorization methods, we can switch the multipart middleware to
      use it too.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9035
      7d28e39f
    • Stan Hu's avatar
      Merge branch 'mk/fix-broken-master-api-variables' into 'master' · d432d674
      Stan Hu authored
      Fix broken master api_variables test
      
      See merge request gitlab-org/gitlab-ce!24165
      d432d674
  2. 04 Jan, 2019 35 commits