From 3454d4cbe3d553e14006e301a4d6843484ce675f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Nov 2020 09:09:06 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitpod.yml | 3 + Gemfile | 2 +- Gemfile.lock | 4 +- .../boards/components/modal/empty_state.vue | 21 +- .../vue_shared/components/gl_mentions.vue | 16 + .../vue_shared/components/markdown/field.vue | 2 +- .../Fix-bad-escape-in-empty_state-vue.yml | 5 + .../unreleased/sh-update-rack-2-2-3.yml | 5 + doc/ci/variables/predefined_variables.md | 8 +- doc/development/documentation/index.md | 282 +---------------- doc/development/documentation/styleguide.md | 4 +- doc/development/documentation/testing.md | 292 ++++++++++++++++++ locale/gitlab.pot | 8 +- spec/features/boards/add_issues_modal_spec.rb | 7 +- spec/features/issues/gfm_autocomplete_spec.rb | 28 ++ 15 files changed, 380 insertions(+), 307 deletions(-) create mode 100644 changelogs/unreleased/Fix-bad-escape-in-empty_state-vue.yml create mode 100644 changelogs/unreleased/sh-update-rack-2-2-3.yml create mode 100644 doc/development/documentation/testing.md diff --git a/.gitpod.yml b/.gitpod.yml index 2c6aa2a962d..6a771e77769 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -49,6 +49,9 @@ tasks: if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then make gitlab-db-migrate fi + cd ../gitlab + git checkout db/structure.sql + cd ../gitlab-development-kit # Waiting for GitLab ... gp await-port 3000 printf "Waiting for GitLab at $(gp url 3000) ..." diff --git a/Gemfile b/Gemfile index e4ddff2a803..deedaff52be 100644 --- a/Gemfile +++ b/Gemfile @@ -173,7 +173,7 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.1.4' +gem 'rack', '~> 2.2.3' # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' diff --git a/Gemfile.lock b/Gemfile.lock index 271c1950ca1..579fd2c8e88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -867,7 +867,7 @@ GEM public_suffix (4.0.6) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.1.4) + rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.3.0) @@ -1446,7 +1446,7 @@ DEPENDENCIES prometheus-client-mmap (~> 0.12.0) pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) - rack (~> 2.1.4) + rack (~> 2.2.3) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) diff --git a/app/assets/javascripts/boards/components/modal/empty_state.vue b/app/assets/javascripts/boards/components/modal/empty_state.vue index cd4512f320f..eb2db260717 100644 --- a/app/assets/javascripts/boards/components/modal/empty_state.vue +++ b/app/assets/javascripts/boards/components/modal/empty_state.vue @@ -1,13 +1,13 @@