diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3ff3f6ca76f..d62e948e636 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -372,7 +372,7 @@ GEM faraday_middleware multi_json fast_blank (1.0.0) - fast_gettext (1.6.0) + fast_gettext (2.1.0) ffaker (2.10.0) ffi (1.15.3) ffi-compiler (1.0.1) @@ -395,7 +395,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.9.0) + fog-aws (3.12.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -453,7 +453,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.2.0.pre.rc2) + gitaly (14.3.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -493,7 +493,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) - gitlab-styles (6.2.0) + gitlab-styles (6.3.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-performance (~> 1.9.2) @@ -546,7 +546,7 @@ GEM grape-entity (0.9.0) activesupport (>= 3.0.0) multi_json (>= 1.3.2) - grape-path-helpers (1.6.3) + grape-path-helpers (1.7.0) activesupport grape (~> 1.3) rake (> 12) @@ -657,7 +657,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.1) regexp_property_values (~> 1.0) - json (2.3.0) + json (2.5.1) json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap @@ -728,7 +728,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.11.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -900,7 +900,7 @@ GEM orm_adapter (0.5.0) os (1.1.1) parallel (1.20.1) - parser (3.0.0.0) + parser (3.0.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -925,7 +925,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.12.0) + prometheus-client-mmap (0.15.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -989,7 +989,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rails-i18n (6.0.0) i18n (>= 0.7, < 2) @@ -1023,19 +1023,12 @@ GEM actionpack (>= 5, < 7) redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-activesupport (5.2.0) - activesupport (>= 3, < 7) - redis-store (>= 1.3, < 2) redis-namespace (1.8.1) redis (>= 3.0.4) - redis-rack (2.1.2) + redis-rack (2.1.3) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) - redis-rails (5.0.2) - redis-actionpack (>= 5.0, < 6) - redis-activesupport (>= 5.0, < 6) - redis-store (>= 1.2, < 2) - redis-store (1.8.1) + redis-store (1.9.0) redis (>= 4, < 5) regexp_parser (2.1.1) regexp_property_values (1.0.0) @@ -1131,7 +1124,7 @@ GEM mini_portile2 (~> 2.5.0) ruby-prof (1.3.1) ruby-progressbar (1.11.0) - ruby-saml (1.12.1) + ruby-saml (1.13.0) nokogiri (>= 1.10.5) rexml ruby-statistics (2.1.2) @@ -1459,7 +1452,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.9) + fog-aws (~> 3.12) fog-core (= 2.1.0) fog-google (~> 1.15) fog-local (~> 0.6) @@ -1471,7 +1464,7 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.2.0.pre.rc2) + gitaly (~> 14.3.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 2.3.0) @@ -1484,7 +1477,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.8.0) gitlab-sidekiq-fetcher (= 0.5.6) - gitlab-styles (~> 6.2.0) + gitlab-styles (~> 6.3.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1493,7 +1486,7 @@ DEPENDENCIES gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.9.0) - grape-path-helpers (~> 1.6.3) + grape-path-helpers (~> 1.7.0) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphlient (~> 0.4.0) @@ -1516,7 +1509,7 @@ DEPENDENCIES ipaddress (~> 0.8.3) jira-ruby (~> 2.1.4) js_regex (~> 3.7) - json (~> 2.3.0) + json (~> 2.5.1) json_schemer (~> 0.2.18) jwt (~> 2.1.0) kaminari (~> 1.0) @@ -1574,7 +1567,7 @@ DEPENDENCIES pg_query (~> 2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.12.0) + prometheus-client-mmap (~> 0.15.0) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.4.0) @@ -1596,8 +1589,8 @@ DEPENDENCIES re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.1.4) + redis-actionpack (~> 5.2.0) redis-namespace (~> 1.8.1) - redis-rails (~> 5.0.2) request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) @@ -1613,7 +1606,7 @@ DEPENDENCIES ruby-magic (~> 0.4) ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) - ruby-saml (~> 1.12.1) + ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) rugged (~> 1.1) |