Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Chandler <wchandler@gitlab.com>2022-07-25 21:10:51 +0300
committerWill Chandler <wchandler@gitlab.com>2022-07-25 21:10:51 +0300
commite8e87c1a9a8b8648c1b499bef74361822026cacd (patch)
treef702c9497f81974d4fddfe7014ad29e29d50ab5e
parent57799f7ef0216b90337d93eef1b63a07af762c91 (diff)
ruby: Fix dependencies in Gemfile.lock
With 4da75e5814680fe0d657bb734099527c74b76905 we attempted to update actionview to resolve a security issue. However, in doing so we updated the version of actionpack and its dependencies, but not actionview itself. This has led to builds emitting the following warning: Your lockfile doesn't include a valid resolution. You can fix this by regenerating your lockfile or trying to manually editing the bad locked gems to a version that satisfies all dependencies. The unmet dependencies are: * actionview (= 6.1.5.1), depended upon actionpack-6.1.5.1, unsatisfied by actionview-6.1.4.7 * activesupport (= 6.1.5.1), depended upon actionpack-6.1.5.1, unsatisfied by activesupport-6.1.4.7 Update Gemfile.lock to update all related dependencies to matched versions and stop this error.
-rw-r--r--ruby/Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 3eded022d..fa214b30c 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -9,13 +9,13 @@ GEM
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actionview (6.1.4.7)
- activesupport (= 6.1.4.7)
+ actionview (6.1.5.1)
+ activesupport (= 6.1.5.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activesupport (6.1.4.7)
+ activesupport (6.1.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)