Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-07

# Conflicts:
#	db/schema.rb
#	spec/features/projects/jobs_spec.rb

[ci skip]

db/schema.rb

@@ -1870,9 +1870,15 @@ ActiveRecord::Schema.define(version: 20171230123729) do
     t.boolean "disable_overriding_approvers_per_merge_request"
     t.integer "storage_version", limit: 2
     t.boolean "resolve_outdated_diff_discussions"
+<<<<<<< HEAD
     t.boolean "remote_mirror_available_overridden"
     t.boolean "only_mirror_protected_branches"
     t.boolean "pull_mirror_available_overridden"
+=======
+    t.boolean "repository_read_only"
+    t.boolean "merge_requests_ff_only_enabled", default: false
+    t.boolean "merge_requests_rebase_enabled", default: false, null: false
+>>>>>>> upstream/master
     t.integer "jobs_cache_index"
   end
 

lib/gitlab/git/repository.rb

@@ -1187,7 +1187,7 @@ module Gitlab
       end
 
       # Items should be of format [[commit_id, path], [commit_id1, path1]]
-      def batch_blobs(items, blob_size_limit: nil)
+      def batch_blobs(items, blob_size_limit: Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE)
         Gitlab::Git::Blob.batch(self, items, blob_size_limit: blob_size_limit)
       end
 

spec/features/projects/jobs_spec.rb

@@ -370,6 +370,7 @@ feature 'Jobs' do
       end
     end
 
+<<<<<<< HEAD
     context 'job project is over shared runners limit' do
       let(:group) { create(:group, :with_used_build_minutes_limit) }
       let(:project) { create(:project, :repository, namespace: group, shared_runners_enabled: true) }
@@ -381,6 +382,8 @@ feature 'Jobs' do
       end
     end
 
+=======
+>>>>>>> upstream/master
     context 'Playable manual action' do
       let(:job) { create(:ci_build, :playable, pipeline: pipeline) }
 

spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb

@@ -19,4 +19,18 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
 
     diff_files
   end
+
+  shared_examples 'initializes a DiffCollection' do
+    it 'returns a valid instance of a DiffCollection' do
+      expect(diff_files).to be_a(Gitlab::Git::DiffCollection)
+    end
+  end
+
+  context 'with Gitaly disabled', :disable_gitaly do
+    it_behaves_like 'initializes a DiffCollection'
+  end
+
+  context 'with Gitaly enabled' do
+    it_behaves_like 'initializes a DiffCollection'
+  end
 end

vendor/gitignore/Eagle.gitignore

@@ -4,6 +4,9 @@
 *.s#?
 *.b#?
 *.l#?
+*.b$?
+*.s$?
+*.l$?
 
 # Eagle project file
 # It contains a serial number and references to the file structure
@@ -31,14 +34,19 @@ eagle.epf
 *.drl
 *.gpi
 *.pls
+*.ger
+*.gpi
+*.xln
 
 *.drd
 *.drd.*
 
+*.s#*
+*.b#*
+
 *.info
 
 *.eps
 
 # file locks introduced since 7.x
 *.lck
-

vendor/gitignore/Global/Eclipse.gitignore

@@ -23,6 +23,9 @@ local.properties
 # CDT-specific (C/C++ Development Tooling)
 .cproject
 
+# CDT- autotools 
+.autotools
+
 # Java annotation processor (APT)
 .factorypath
 

vendor/gitignore/Global/JetBrains.gitignore

@@ -21,6 +21,7 @@
 
 # CMake
 cmake-build-debug/
+cmake-build-release/
 
 # Mongo Explorer plugin:
 .idea/**/mongoSettings.xml

vendor/gitignore/Global/Matlab.gitignore

-##---------------------------------------------------
-## Remove autosaves generated by the MATLAB editor
-## We have git for backups!
-##---------------------------------------------------
-
 # Windows default autosave extension
 *.asv
 
@@ -12,12 +7,19 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation
+# Packaged app and toolbox files 
+*.mlappinstall 
+*.mltbx 
+  
+# Generated helpsearch folders 
+helpsearch*/ 
+
+# Simulink code generation folders
 slprj/
 sccprj/
 
-# Session info
-octave-workspace
-
 # Simulink autosave extension
 *.autosave
+
+# Octave session info
+octave-workspace

vendor/gitignore/Go.gitignore

 # Binaries for programs and plugins
 *.exe
+*.exe~
 *.dll
 *.so
 *.dylib

vendor/gitignore/Node.gitignore

@@ -57,3 +57,5 @@ typings/
 # dotenv environment variables file
 .env
 
+# next.js build output
+.next

vendor/gitignore/Rails.gitignore

@@ -42,3 +42,7 @@ bower.json
 
 # Ignore Byebug command history file.
 .byebug_history
+
+# Ignore node_modules
+node_modules/
+

vendor/gitignore/Umbraco.gitignore

@@ -16,8 +16,11 @@
 
 # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
 # Make sure to include details from VisualStudio.gitignore BEFORE this
-!**/App_Data/[Pp]ackages/
-!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+!**/App_Data/[Pp]ackages/*
+!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
 
 # ImageProcessor DiskCache 
 **/App_Data/cache/
+
+# Ignore the Models Builder models out of date flag
+**/App_Data/Models/ood.flag

vendor/gitignore/VisualStudio.gitignore

@@ -219,6 +219,10 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
+# Including strong name files can present a security risk 
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
@@ -313,3 +317,7 @@ OpenCover/
 
 # Azure Stream Analytics local run output 
 ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+

vendor/gitignore/WordPress.gitignore

@@ -7,6 +7,7 @@ wp-content/blogs.dir/
 wp-content/cache/
 wp-content/upgrade/
 wp-content/uploads/
+wp-content/mu-plugins/
 wp-content/wp-cache-config.php
 wp-content/plugins/hello.php
 

vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml

@@ -112,6 +112,19 @@ sast:
     - sast .
   artifacts:
     paths: [gl-sast-report.json]
+    
+sast:container:
+  image: docker:latest
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:dind
+  script:
+    - setup_docker
+    - sast_container
+  artifacts:
+    paths: [gl-sast-container-report.json]
 
 review:
   stage: review
@@ -247,6 +260,18 @@ production:
   export CI_APPLICATION_TAG=$CI_COMMIT_SHA
   export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID}
   export TILLER_NAMESPACE=$KUBE_NAMESPACE
+  
+  function sast_container() {
+    docker run -d --name db arminc/clair-db:latest
+    docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
+    apk add -U wget ca-certificates
+    docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
+    wget https://github.com/arminc/clair-scanner/releases/download/v6/clair-scanner_linux_386
+    mv clair-scanner_linux_386 clair-scanner
+    chmod +x clair-scanner
+    touch clair-whitelist.yml
+    ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
+  }
 
   function codeclimate() {
     cc_opts="--env CODECLIMATE_CODE="$PWD" \

vendor/gitlab-ci-yml/Mono.gitlab-ci.yml

+# This is a simple gitlab continuous integration template (compatible with the shared runner provided on gitlab.com)
+# using the official mono docker image to build a visual studio project.
+#
+# MyProject.sln
+#   MyProject\
+#     MyProject\
+#        MyProject.csproj (console application)
+#     MyProject.Test\
+#        MyProject.Test.csproj (test library using nuget packages "NUnit" and "NUnit.ConsoleRunner")
+#
+# Please find the full example project here:
+# https://gitlab.com/tobiaskoch/gitlab-ci-example-mono
+
+# see https://hub.docker.com/_/mono/
+image: mono:latest
+
+stages:
+  - test
+  - deploy
+
+before_script:
+  - nuget restore -NonInteractive
+
+release:
+  stage: deploy
+  only:
+    - master
+  artifacts:
+    paths:
+      - build/release/MyProject.exe
+  script:
+    # The output path is relative to the position of the csproj-file
+    - msbuild /p:Configuration="Release" /p:Platform="Any CPU"
+      /p:OutputPath="./../../build/release/" "MyProject.sln"
+    
+debug:
+  stage: test
+  script:
+    # The output path is relative to the position of the csproj-file
+    - msbuild /p:Configuration="Debug" /p:Platform="Any CPU"
+      /p:OutputPath="./../../build/debug/" "MyProject.sln"
+    - mono packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe build/debug/MyProject.Test.dll
\ No newline at end of file

vendor/gitlab-ci-yml/Rust.gitlab-ci.yml

@@ -20,4 +20,4 @@ image: "rust:latest"
 test:cargo:
   script:
   - rustc --version && cargo --version      # Print version info for debugging
-  - cargo test --verbose --jobs 1 --release # Don't parallelise to make errors more readable
+  - cargo test --all --verbose

vendor/licenses.csv

@@ -23,7 +23,7 @@ autoprefixer-rails,6.2.3,MIT
 axiom-types,0.1.1,MIT
 babosa,1.0.2,MIT
 base32,0.3.2,MIT
-batch-loader,1.1.1,MIT
+batch-loader,1.2.1,MIT
 bcrypt,3.1.11,MIT
 bcrypt_pbkdf,1.0.0,MIT
 bindata,2.4.1,ruby
@@ -73,8 +73,9 @@ faraday_middleware,0.11.0.1,MIT
 faraday_middleware-multi_json,0.0.6,MIT
 fast_gettext,1.4.0,"MIT,ruby"
 ffi,1.9.18,New BSD
-flipper,0.10.2,MIT
-flipper-active_record,0.10.2,MIT
+flipper,0.11.0,MIT
+flipper-active_record,0.11.0,MIT
+flipper-active_support_cache_store,0.11.0,MIT
 flowdock,0.7.1,MIT
 fog-aliyun,0.2.0,MIT
 fog-aws,1.4.0,MIT
@@ -92,7 +93,7 @@ gemojione,3.3.0,MIT
 get_process_mem,0.2.0,MIT
 gettext_i18n_rails,1.8.0,MIT
 gettext_i18n_rails_js,1.2.0,MIT
-gitaly-proto,0.59.0,MIT
+gitaly-proto,0.64.0,MIT
 github-linguist,4.7.6,MIT
 github-markup,1.6.1,MIT
 gitlab-flowdock-git-hook,1.0.1,MIT
@@ -164,7 +165,7 @@ multi_xml,0.6.0,MIT
 multipart-post,2.0.0,MIT
 mustermann,1.0.0,MIT
 mustermann-grape,1.0.0,MIT
-mysql2,0.4.5,MIT
+mysql2,0.4.10,MIT
 net-ldap,0.16.0,MIT
 net-ssh,4.1.0,MIT
 netrc,0.11.0,MIT
@@ -210,7 +211,7 @@ po_to_json,1.0.1,MIT
 posix-spawn,0.3.13,MIT
 premailer,1.10.4,New BSD
 premailer-rails,1.9.7,MIT
-prometheus-client-mmap,0.7.0.beta43,Apache 2.0
+prometheus-client-mmap,0.7.0.beta44,Apache 2.0
 public_suffix,3.0.0,MIT
 pyu-ruby-sasl,0.0.3.3,MIT
 rack,1.6.8,MIT
@@ -237,11 +238,11 @@ re2,1.1.1,New BSD
 recaptcha,3.0.0,MIT
 recursive-open-struct,1.0.0,MIT
 redcarpet,3.4.0,MIT
-redis,3.3.3,MIT
+redis,3.3.5,MIT
 redis-actionpack,5.0.2,MIT
 redis-activesupport,5.0.4,MIT
 redis-namespace,1.5.2,MIT
-redis-rack,2.0.3,MIT
+redis-rack,2.0.4,MIT
 redis-rails,5.0.2,MIT
 redis-store,1.4.1,MIT
 representable,3.0.4,MIT
@@ -273,7 +274,7 @@ select2-rails,3.5.9.3,MIT
 sentry-raven,2.5.3,Apache 2.0
 settingslogic,2.0.9,MIT
 sexp_processor,4.9.0,MIT
-sidekiq,5.0.4,LGPL
+sidekiq,5.0.5,LGPL
 sidekiq-cron,0.6.0,MIT
 sidekiq-limit_fetch,3.4.0,MIT
 signet,0.7.3,Apache 2.0