From e440c86979e9c02a09fb6558f59a1fbe29433b51 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Jan 2020 09:07:59 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 2 +- README.md | 2 +- .../list/components/release_block.vue | 183 ++------------- .../list/components/release_block_assets.vue | 65 ++++++ .../list/components/release_block_author.vue | 42 ++++ .../list/components/release_block_header.vue | 47 ++++ .../components/release_block_metadata.vue | 84 +++++++ .../components/release_block_milestones.vue | 51 +++++ changelogs/unreleased/ruby-2-6-5-source.yml | 5 + doc/administration/logs.md | 2 +- .../monitoring/prometheus/gitlab_metrics.md | 2 +- doc/development/pipelines.md | 4 +- doc/install/installation.md | 6 +- doc/update/upgrading_from_source.md | 6 +- lib/gitlab/usage_data.rb | 4 +- qa/qa/fixtures/auto_devops_rack/Dockerfile | 2 +- ...latest_event_no_stack_sample_response.json | 4 +- .../issue_latest_event_sample_response.json | 212 +++++++++--------- .../frontend/jobs/components/log/mock_data.js | 2 +- spec/lib/gitlab/usage_data_spec.rb | 6 - 20 files changed, 437 insertions(+), 294 deletions(-) create mode 100644 app/assets/javascripts/releases/list/components/release_block_assets.vue create mode 100644 app/assets/javascripts/releases/list/components/release_block_author.vue create mode 100644 app/assets/javascripts/releases/list/components/release_block_header.vue create mode 100644 app/assets/javascripts/releases/list/components/release_block_metadata.vue create mode 100644 app/assets/javascripts/releases/list/components/release_block_milestones.vue create mode 100644 changelogs/unreleased/ruby-2-6-5-source.yml diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 885fd109227..8c3df170f6d 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -273,7 +273,7 @@ static-analysis: script: - scripts/static-analysis cache: - key: "debian-stretch-ruby-2.6.3-and-rubocop" + key: "debian-stretch-ruby-2.6-and-rubocop" paths: - vendor/ruby - tmp/rubocop_cache diff --git a/README.md b/README.md index 95a2192a375..b3b66959884 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ Instructions on how to start GitLab and how to run the tests can be found in the GitLab is a Ruby on Rails application that runs on the following software: - Ubuntu/Debian/CentOS/RHEL/OpenSUSE -- Ruby (MRI) 2.6.3 +- Ruby (MRI) 2.6.5 - Git 2.8.4+ - Redis 2.8+ - PostgreSQL (preferred) or MySQL diff --git a/app/assets/javascripts/releases/list/components/release_block.vue b/app/assets/javascripts/releases/list/components/release_block.vue index d5621808ed7..d924b5795f0 100644 --- a/app/assets/javascripts/releases/list/components/release_block.vue +++ b/app/assets/javascripts/releases/list/components/release_block.vue @@ -1,34 +1,27 @@