From 94529dd65f04e7864fe6d7f43b52bd96661c9df2 Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Fri, 29 May 2020 21:28:32 +0000
Subject: [PATCH] Revert "Merge branch 'bump-rails-6.0.3.1' into 'master'"
This reverts merge request !32486
---
Gemfile | 2 +-
Gemfile.lock | 102 ++++++++++++++++++++++++------------------------
package.json | 2 +-
qa/Gemfile | 2 +-
qa/Gemfile.lock | 6 +--
yarn.lock | 8 ++--
6 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/Gemfile b/Gemfile
index 1ec4eaac466c6..5483fd5ca15d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '~> 6.0.3.1'
+gem 'rails', '~> 6.0.3'
gem 'bootsnap', '~> 1.4.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index e7cb545500cd8..03d492651edac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,59 +6,59 @@ GEM
ace-rails-ap (4.1.2)
acme-client (2.0.5)
faraday (~> 0.9, >= 0.9.1)
- actioncable (6.0.3.1)
- actionpack (= 6.0.3.1)
+ actioncable (6.0.3)
+ actionpack (= 6.0.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.0.3.1)
- actionpack (= 6.0.3.1)
- activejob (= 6.0.3.1)
- activerecord (= 6.0.3.1)
- activestorage (= 6.0.3.1)
- activesupport (= 6.0.3.1)
+ actionmailbox (6.0.3)
+ actionpack (= 6.0.3)
+ activejob (= 6.0.3)
+ activerecord (= 6.0.3)
+ activestorage (= 6.0.3)
+ activesupport (= 6.0.3)
mail (>= 2.7.1)
- actionmailer (6.0.3.1)
- actionpack (= 6.0.3.1)
- actionview (= 6.0.3.1)
- activejob (= 6.0.3.1)
+ actionmailer (6.0.3)
+ actionpack (= 6.0.3)
+ actionview (= 6.0.3)
+ activejob (= 6.0.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.0.3.1)
- actionview (= 6.0.3.1)
- activesupport (= 6.0.3.1)
+ actionpack (6.0.3)
+ actionview (= 6.0.3)
+ activesupport (= 6.0.3)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.3.1)
- actionpack (= 6.0.3.1)
- activerecord (= 6.0.3.1)
- activestorage (= 6.0.3.1)
- activesupport (= 6.0.3.1)
+ actiontext (6.0.3)
+ actionpack (= 6.0.3)
+ activerecord (= 6.0.3)
+ activestorage (= 6.0.3)
+ activesupport (= 6.0.3)
nokogiri (>= 1.8.5)
- actionview (6.0.3.1)
- activesupport (= 6.0.3.1)
+ actionview (6.0.3)
+ activesupport (= 6.0.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.0.3.1)
- activesupport (= 6.0.3.1)
+ activejob (6.0.3)
+ activesupport (= 6.0.3)
globalid (>= 0.3.6)
- activemodel (6.0.3.1)
- activesupport (= 6.0.3.1)
- activerecord (6.0.3.1)
- activemodel (= 6.0.3.1)
- activesupport (= 6.0.3.1)
+ activemodel (6.0.3)
+ activesupport (= 6.0.3)
+ activerecord (6.0.3)
+ activemodel (= 6.0.3)
+ activesupport (= 6.0.3)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
- activestorage (6.0.3.1)
- actionpack (= 6.0.3.1)
- activejob (= 6.0.3.1)
- activerecord (= 6.0.3.1)
+ activestorage (6.0.3)
+ actionpack (= 6.0.3)
+ activejob (= 6.0.3)
+ activerecord (= 6.0.3)
marcel (~> 0.3.1)
- activesupport (6.0.3.1)
+ activesupport (6.0.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -801,20 +801,20 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.1)
- rails (6.0.3.1)
- actioncable (= 6.0.3.1)
- actionmailbox (= 6.0.3.1)
- actionmailer (= 6.0.3.1)
- actionpack (= 6.0.3.1)
- actiontext (= 6.0.3.1)
- actionview (= 6.0.3.1)
- activejob (= 6.0.3.1)
- activemodel (= 6.0.3.1)
- activerecord (= 6.0.3.1)
- activestorage (= 6.0.3.1)
- activesupport (= 6.0.3.1)
+ rails (6.0.3)
+ actioncable (= 6.0.3)
+ actionmailbox (= 6.0.3)
+ actionmailer (= 6.0.3)
+ actionpack (= 6.0.3)
+ actiontext (= 6.0.3)
+ actionview (= 6.0.3)
+ activejob (= 6.0.3)
+ activemodel (= 6.0.3)
+ activerecord (= 6.0.3)
+ activestorage (= 6.0.3)
+ activesupport (= 6.0.3)
bundler (>= 1.3.0)
- railties (= 6.0.3.1)
+ railties (= 6.0.3)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
@@ -828,9 +828,9 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
- railties (6.0.3.1)
- actionpack (= 6.0.3.1)
- activesupport (= 6.0.3.1)
+ railties (6.0.3)
+ actionpack (= 6.0.3)
+ activesupport (= 6.0.3)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
@@ -1335,7 +1335,7 @@ DEPENDENCIES
rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
rack-timeout
- rails (~> 6.0.3.1)
+ rails (~> 6.0.3)
rails-controller-testing
rails-i18n (~> 6.0)
rainbow (~> 3.0)
diff --git a/package.json b/package.json
index f10b7d0119b09..c9f994bf69da7 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"@gitlab/svgs": "1.131.0",
"@gitlab/ui": "16.1.0",
"@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "^6.0.3-1",
+ "@rails/actioncable": "^6.0.3",
"@sentry/browser": "^5.10.2",
"@sourcegraph/code-host-integration": "0.0.48",
"@toast-ui/editor": "^2.0.1",
diff --git a/qa/Gemfile b/qa/Gemfile
index d5c682ef76f46..6eb8733ab419e 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'gitlab-qa'
-gem 'activesupport', '~> 6.0.3.1' # This should stay in sync with the root's Gemfile
+gem 'activesupport', '~> 6.0.3' # This should stay in sync with the root's Gemfile
gem 'capybara', '~> 3.29.0'
gem 'capybara-screenshot', '~> 1.0.23'
gem 'rake', '~> 12.3.0'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 23324fccdec85..9aeba236c9646 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.3.1)
+ activesupport (6.0.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -54,7 +54,7 @@ GEM
mime-types-data (3.2020.0425)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
- minitest (5.14.1)
+ minitest (5.14.0)
netrc (0.11.0)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
@@ -116,7 +116,7 @@ PLATFORMS
ruby
DEPENDENCIES
- activesupport (~> 6.0.3.1)
+ activesupport (~> 6.0.3)
airborne (~> 0.3.4)
capybara (~> 3.29.0)
capybara-screenshot (~> 1.0.23)
diff --git a/yarn.lock b/yarn.lock
index eba796a4881b0..a5992d1fa5530 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -983,10 +983,10 @@
consola "^2.10.1"
node-fetch "^2.6.0"
-"@rails/actioncable@^6.0.3-1":
- version "6.0.3-1"
- resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-1.tgz#9b9eb8858a6507162911007d355d9a206e1c5caa"
- integrity sha512-szFhWD+V5TAxVNVIG16klgq+ypqA5k5AecLarTTrXgOG8cawVbQdOAwLbCmzkwiQ60rGSxAFoC1u2LrzxSK2Aw==
+"@rails/actioncable@^6.0.3":
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3.tgz#722b4b639936129307ddbab3a390f6bcacf3e7bc"
+ integrity sha512-I01hgqxxnOgOtJTGlq0ZsGJYiTEEiSGVEGQn3vimZSqEP1HqzyFNbzGTq14Xdyeow2yGJjygjoFF1pmtE+SQaw==
"@sentry/browser@^5.10.2":
version "5.10.2"
--
GitLab