diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 12:10:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 12:10:52 +0300 |
commit | ab9c1dbb2dc0e591a6ce4466e15766d99f4abf4b (patch) | |
tree | 228f0953c110a7a2a4438666994995c702bac6de /Gemfile.lock | |
parent | e6f170581eddc84da845d4f2e511f4776848e9f7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9c0896891a7..a39a504e34b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -445,6 +445,9 @@ GEM gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pg_query (1.3.1) + gitlab-pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) gitlab-styles (6.0.0) @@ -864,11 +867,11 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) public_suffix (4.0.6) puma (5.1.1) nio4r (~> 2.0) @@ -1131,6 +1134,7 @@ GEM simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) + slop (3.6.0) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) spring (2.1.1) @@ -1364,6 +1368,7 @@ DEPENDENCIES gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) + gitlab-pry-byebug gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 6.0.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1455,8 +1460,8 @@ DEPENDENCIES png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) - pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) + pry-remote puma (~> 5.1.1) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) |