Merge branch 'ce-to-ee-2018-08-08' into 'master'

CE upstream - 2018-08-08 09:23 UTC

See merge request gitlab-org/gitlab-ee!6835

CONTRIBUTING.md

@@ -197,7 +197,7 @@ The current team labels are:
 - ~Plan
 - ~Quality
 - ~Release
-- ~"Security Products"
+- ~Secure
 - ~UX
 The descriptions on the [labels page][labels-page] explain what falls under the

app/views/doorkeeper/authorizations/new.html.haml

@@ -4,7 +4,7 @@
       .modal-header
         %h3.page-title
           - link_to_client = link_to(@pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer')
-          = _("Authorize %{link_to_client} to use your account?")
+          = _("Authorize %{link_to_client} to use your account?").html_safe % { link_to_client: link_to_client }
       .modal-body
         - if current_user.admin?

vendor/Dockerfile/Node-alpine.Dockerfile

-FROM node:7.9-alpine
+FROM node:8.11-alpine
 WORKDIR /usr/src/app
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+
 COPY package.json /usr/src/app/
-RUN npm install && npm cache clean
-COPY . /usr/src/app
-CMD [ "npm", "start" ]
+RUN npm install
+COPY . /usr/src/app
 # replace this with your application's default port
 EXPOSE 8888
+CMD [ "npm", "start" ]

vendor/Dockerfile/Node.Dockerfile

-FROM node:7.9
+FROM node:8.11
 WORKDIR /usr/src/app
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+
 COPY package.json /usr/src/app/
-RUN npm install && npm cache clean
-COPY . /usr/src/app
-CMD [ "npm", "start" ]
+RUN npm install
+COPY . /usr/src/app
 # replace this with your application's default port
 EXPOSE 8888
+CMD [ "npm", "start" ]
\ No newline at end of file

vendor/Dockerfile/Ruby-alpine.Dockerfile

-FROM ruby:2.4-alpine
+FROM ruby:2.5-alpine
 # Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
 # Or delete entirely if not needed.
-RUN apk --no-cache add nodejs postgresql-client
+RUN apk --no-cache add nodejs postgresql-client tzdata
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -11,7 +11,10 @@ RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 COPY Gemfile Gemfile.lock /usr/src/app/
-RUN bundle install
+# Install build dependencies - required for gems with native dependencies
+RUN apk add --no-cache --virtual build-deps build-base postgresql-dev && \
+  bundle install && \
+  apk del build-deps
 COPY . /usr/src/app
@@ -21,4 +24,4 @@ COPY . /usr/src/app
 # For Rails
 EXPOSE 3000
-CMD ["rails", "server"]
+CMD ["bundle", "exec", "rails", "server"]

vendor/Dockerfile/Ruby.Dockerfile

-FROM ruby:2.4
+FROM ruby:2.5
 # Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
 # Or delete entirely if not needed.
@@ -24,4 +24,4 @@ COPY . /usr/src/app
 # For Rails
 EXPOSE 3000
-CMD ["rails", "server", "-b", "0.0.0.0"]
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]

vendor/gitignore/Autotools.gitignore

@@ -16,6 +16,8 @@ autom4te.cache
 /compile
 /config.guess
 /config.h.in
+/config.log
+/config.status
 /config.sub
 /configure
 /configure.scan

vendor/gitignore/Laravel.gitignore

 vendor/
 node_modules/
 npm-debug.log
+yarn-error.log
 # Laravel 4 specific
 bootstrap/compiled.php
@@ -10,11 +11,7 @@ app/storage/
 public/storage
 public/hot
 storage/*.key
-.env.*.php
-.env.php
 .env
 Homestead.yaml
 Homestead.json
-
-# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
-.rocketeer/
+/.vagrant

vendor/gitignore/VisualStudio.gitignore

@@ -59,7 +59,7 @@ StyleCopReport.xml
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
@@ -327,3 +327,6 @@ ASALocalRun/
 # MFractors (Xamarin productivity tool) working folder
 .mfractor/
+
+# Local History for Visual Studio
+.localhistory/

vendor/gitlab-ci-yml/Maven.gitlab-ci.yml

@@ -17,7 +17,7 @@
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
   # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.

vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml

 # Official language image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/ruby/tags/
-image: "ruby:2.4"
+image: "ruby:2.5"
 # Pick zero or more services to be used on all builds.
 # Only needed when using a docker container to run your tests in.