Created
January 4, 2023 21:48
-
-
Save nilbus/b3ee96493076a3441d6cf034f0e65140 to your computer and use it in GitHub Desktop.
A sample file with really long conflicts.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| GEM | |
| remote: https://custom.source/repository/gems/ | |
| specs: | |
| <<<<<<< ours | |
| active_model_serializers (0.10.13) | |
| actionpack (>= 4.1, < 7.1) | |
| activemodel (>= 4.1, < 7.1) | |
| case_transform (>= 0.2) | |
| jsonapi-renderer (>= 0.1.1.beta1, < 0.3) | |
| activerecord-import (1.2.0) | |
| activerecord (>= 3.2) | |
| addressable (2.8.1) | |
| public_suffix (>= 2.0.2, < 6.0) | |
| api-pagination (5.0.0) | |
| batcher (0.1.3) | |
| bootsnap (1.13.0) | |
| msgpack (~> 1.2) | |
| brakeman (5.3.1) | |
| bugsnag (6.24.2) | |
| concurrent-ruby (~> 1.0) | |
| bullet (7.0.3) | |
| activesupport (>= 3.0.0) | |
| uniform_notifier (~> 1.11) | |
| cloudinary (1.23.0) | |
| aws_cf_signer | |
| rest-client (>= 2.0.0) | |
| connection_pool (2.3.0) | |
| dalli (3.2.2) | |
| database_cleaner (2.0.1) | |
| database_cleaner-active_record (~> 2.0.0) | |
| db-query-matchers (0.11.0) | |
| activesupport (>= 4.0, < 7.1) | |
| rspec (>= 3.0) | |
| debug (1.7.0) | |
| irb (>= 1.5.0) | |
| reline (>= 0.3.1) | |
| deep_merge (1.2.2) | |
| departure (6.4.0) | |
| activerecord (>= 5.2.0, < 7.1, != 7.0.0) | |
| mysql2 (>= 0.4.0, <= 0.5.4) | |
| railties (>= 5.2.0, < 7.1, != 7.0.0) | |
| dotenv-rails (2.8.1) | |
| dotenv (= 2.8.1) | |
| railties (>= 3.2) | |
| e2mmap (0.1.0) | |
| factory_bot_rails (6.2.0) | |
| factory_bot (~> 6.2.0) | |
| railties (>= 5.0.0) | |
| faker (3.0.0) | |
| i18n (>= 1.8.11, < 2) | |
| foreman (0.87.2) | |
| guard-rspec (4.7.3) | |
| guard (~> 2.1) | |
| guard-compat (~> 1.1) | |
| rspec (>= 2.99.0, < 4.0) | |
| guard-rubocop (1.5.0) | |
| guard (~> 2.0) | |
| rubocop (< 2.0) | |
| hashdiff (1.0.0) | |
| io-console (0.6.0) | |
| irb (1.6.1) | |
| reline (>= 0.3.0) | |
| json-schema (3.0.0) | |
| addressable (>= 2.8) | |
| jsonapi-serializer (2.2.0) | |
| activesupport (>= 4.2) | |
| listen (3.7.1) | |
| rb-fsevent (~> 0.10, >= 0.10.3) | |
| rb-inotify (~> 0.9, >= 0.9.10) | |
| loofah (2.19.0) | |
| crass (~> 1.0.2) | |
| nokogiri (>= 1.5.9) | |
| memory_profiler (1.0.0) | |
| mpn-rb (0.1.1) | |
| rest-client (>= 2) | |
| msgpack (1.6.0) | |
| mysql2 (0.5.4) | |
| nokogiri (1.13.9) | |
| mini_portile2 (~> 2.8.0) | |
| racc (~> 1.4) | |
| nokogiri (1.13.9-x86_64-linux) | |
| racc (~> 1.4) | |
| oauth2c (1.2.0) | |
| http (~> 4) | |
| jwt (~> 1.5) | |
| opengraph_parser (0.2.5) | |
| addressable | |
| nokogiri | |
| packwerk (2.2.0) | |
| activesupport (>= 5.2) | |
| ast | |
| better_html | |
| bundler | |
| constant_resolver (>= 0.2.0) | |
| digest | |
| parallel | |
| parser | |
| sorbet-runtime (>= 0.5.9914) | |
| paper_trail (12.0.0) | |
| activerecord (>= 5.2) | |
| request_store (~> 1.1) | |
| pry-rails (0.3.9) | |
| pry (>= 0.10.4) | |
| puma (5.6.5) | |
| nio4r (~> 2.0) | |
| pundit (2.2.0) | |
| activesupport (>= 3.0.0) | |
| rack-cors (1.1.1) | |
| rack (>= 2.0.0) | |
| rails (6.1.7) | |
| actioncable (= 6.1.7) | |
| actionmailbox (= 6.1.7) | |
| actionmailer (= 6.1.7) | |
| actionpack (= 6.1.7) | |
| actiontext (= 6.1.7) | |
| actionview (= 6.1.7) | |
| activejob (= 6.1.7) | |
| activemodel (= 6.1.7) | |
| activerecord (= 6.1.7) | |
| activestorage (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| bundler (>= 1.15.0) | |
| railties (= 6.1.7) | |
| sprockets-rails (>= 2.0.0) | |
| rails-erd (1.7.2) | |
| activerecord (>= 4.2) | |
| activesupport (>= 4.2) | |
| choice (~> 0.2.0) | |
| ruby-graphviz (~> 1.2) | |
| rails-html-sanitizer (1.4.3) | |
| loofah (~> 2.3) | |
| rails_semantic_logger (4.10.0) | |
| rack | |
| railties (>= 5.1) | |
| semantic_logger (~> 4.9) | |
| redis-namespace (1.9.0) | |
| redis (>= 4) | |
| reline (0.3.2) | |
| io-console (~> 0.5) | |
| rest-client (2.1.0) | |
| http-accept (>= 1.7.0, < 2.0) | |
| http-cookie (>= 1.0.2, < 2.0) | |
| mime-types (>= 1.16, < 4.0) | |
| netrc (~> 0.8) | |
| retriable (3.1.2) | |
| rollout (2.5.0) | |
| rspec-benchmark (0.6.0) | |
| benchmark-malloc (~> 0.2) | |
| benchmark-perf (~> 0.6) | |
| benchmark-trend (~> 0.4) | |
| rspec (>= 3.0) | |
| rspec-rails (4.0.2) | |
| actionpack (>= 4.2) | |
| activesupport (>= 4.2) | |
| railties (>= 4.2) | |
| rspec-core (~> 3.10) | |
| rspec-expectations (~> 3.10) | |
| rspec-mocks (~> 3.10) | |
| rspec-support (~> 3.10) | |
| rspec_junit_formatter (0.6.0) | |
| rspec-core (>= 2, < 4, != 2.12.0) | |
| ruby-oembed (0.12.0) | |
| sassc-rails (2.1.2) | |
| railties (>= 4.0.0) | |
| sassc (>= 2.0) | |
| sprockets (> 3.0) | |
| sprockets-rails | |
| tilt | |
| scout_apm (5.3.2) | |
| parser | |
| semantic_logger (4.12.0) | |
| concurrent-ruby (~> 1.0) | |
| shoulda-matchers (5.2.0) | |
| activesupport (>= 5.2.0) | |
| sidekiq (5.2.10) | |
| connection_pool (~> 2.2, >= 2.2.2) | |
| rack (~> 2.0) | |
| rack-protection (>= 1.5.0) | |
| redis (~> 4.5, < 4.6.0) | |
| sidekiq-inspeqtor (0.2.2) | |
| sidekiq (>= 4.0, < 6) | |
| sidekiq-scheduler (2.1.10) | |
| redis (>= 3, < 5) | |
| rufus-scheduler (~> 3.2) | |
| sidekiq (>= 3) | |
| tilt (>= 1.4.0) | |
| snappy (0.3.0) | |
| spring (2.1.1) | |
| spring-commands-rspec (1.0.4) | |
| spring (>= 0.9.1) | |
| spring-commands-rubocop (0.4.0) | |
| spring (>= 1.0) | |
| spring-watcher-listen (2.0.1) | |
| listen (>= 2.7, < 4.0) | |
| spring (>= 1.2, < 3.0) | |
| sprockets (4.1.1) | |
| concurrent-ruby (~> 1.0) | |
| rack (> 1, < 3) | |
| sprockets_uglifier_with_source_maps (2.1.0) | |
| sprockets-rails (~> 3.0) | |
| uglifier (>= 2.5) | |
| sql_spy (0.4.0) | |
| statsd-ruby (1.5.0) | |
| stimpack (0.3.0) | |
| rails | |
| thwait (0.2.0) | |
| e2mmap | |
| timecop (0.9.5) | |
| uglifier (4.2.0) | |
| execjs (>= 0.3.0, < 3) | |
| web-console (4.2.0) | |
| actionview (>= 6.0.0) | |
| activemodel (>= 6.0.0) | |
| bindex (>= 0.4.0) | |
| railties (>= 6.0.0) | |
| webmock (3.6.0) | |
| addressable (>= 2.3.6) | |
| crack (>= 0.3.2) | |
| hashdiff (>= 0.4.0, < 2.0.0) | |
| webpacker (5.4.3) | |
| activesupport (>= 5.2) | |
| rack-proxy (>= 0.6.1) | |
| railties (>= 5.2) | |
| semantic_range (>= 2.3.0) | |
| will_paginate (3.1.7) | |
| zeitwerk (2.6.3) | |
| GEM | |
| remote: https://custom.source/repository/gems_proxy/ | |
| specs: | |
| ||||||| base | |
| active_model_serializers (0.10.13) | |
| actionpack (>= 4.1, < 7.1) | |
| activemodel (>= 4.1, < 7.1) | |
| case_transform (>= 0.2) | |
| jsonapi-renderer (>= 0.1.1.beta1, < 0.3) | |
| activerecord-import (1.2.0) | |
| activerecord (>= 3.2) | |
| addressable (2.8.1) | |
| public_suffix (>= 2.0.2, < 6.0) | |
| api-pagination (5.0.0) | |
| batcher (0.1.3) | |
| bootsnap (1.13.0) | |
| msgpack (~> 1.2) | |
| brakeman (5.3.1) | |
| bugsnag (6.24.2) | |
| concurrent-ruby (~> 1.0) | |
| bullet (7.0.3) | |
| activesupport (>= 3.0.0) | |
| uniform_notifier (~> 1.11) | |
| cloudinary (1.23.0) | |
| aws_cf_signer | |
| rest-client (>= 2.0.0) | |
| connection_pool (2.3.0) | |
| dalli (3.2.2) | |
| database_cleaner (2.0.1) | |
| database_cleaner-active_record (~> 2.0.0) | |
| db-query-matchers (0.11.0) | |
| activesupport (>= 4.0, < 7.1) | |
| rspec (>= 3.0) | |
| debug (1.6.2) | |
| irb (>= 1.3.6) | |
| reline (>= 0.3.1) | |
| deep_merge (1.2.2) | |
| departure (6.4.0) | |
| activerecord (>= 5.2.0, < 7.1, != 7.0.0) | |
| mysql2 (>= 0.4.0, <= 0.5.4) | |
| railties (>= 5.2.0, < 7.1, != 7.0.0) | |
| dotenv-rails (2.8.1) | |
| dotenv (= 2.8.1) | |
| railties (>= 3.2) | |
| e2mmap (0.1.0) | |
| factory_bot_rails (6.2.0) | |
| factory_bot (~> 6.2.0) | |
| railties (>= 5.0.0) | |
| faker (3.0.0) | |
| i18n (>= 1.8.11, < 2) | |
| foreman (0.87.2) | |
| guard-rspec (4.7.3) | |
| guard (~> 2.1) | |
| guard-compat (~> 1.1) | |
| rspec (>= 2.99.0, < 4.0) | |
| guard-rubocop (1.5.0) | |
| guard (~> 2.0) | |
| rubocop (< 2.0) | |
| hashdiff (1.0.0) | |
| jaeger-client (1.3.0) | |
| opentracing (~> 0.3) | |
| thrift | |
| json-schema (3.0.0) | |
| addressable (>= 2.8) | |
| jsonapi-serializer (2.2.0) | |
| activesupport (>= 4.2) | |
| listen (3.7.1) | |
| rb-fsevent (~> 0.10, >= 0.10.3) | |
| rb-inotify (~> 0.9, >= 0.9.10) | |
| loofah (2.19.0) | |
| crass (~> 1.0.2) | |
| nokogiri (>= 1.5.9) | |
| memory_profiler (1.0.0) | |
| mpn-rb (0.1.1) | |
| rest-client (>= 2) | |
| msgpack (1.6.0) | |
| mysql2 (0.5.4) | |
| nokogiri (1.13.9) | |
| mini_portile2 (~> 2.8.0) | |
| racc (~> 1.4) | |
| nokogiri (1.13.9-x86_64-linux) | |
| racc (~> 1.4) | |
| oauth2c (1.2.0) | |
| http (~> 4) | |
| jwt (~> 1.5) | |
| opengraph_parser (0.2.5) | |
| addressable | |
| nokogiri | |
| packwerk (2.2.0) | |
| activesupport (>= 5.2) | |
| ast | |
| better_html | |
| bundler | |
| constant_resolver (>= 0.2.0) | |
| digest | |
| parallel | |
| parser | |
| sorbet-runtime (>= 0.5.9914) | |
| paper_trail (12.0.0) | |
| activerecord (>= 5.2) | |
| request_store (~> 1.1) | |
| pry-rails (0.3.9) | |
| pry (>= 0.10.4) | |
| puma (5.6.5) | |
| nio4r (~> 2.0) | |
| pundit (2.2.0) | |
| activesupport (>= 3.0.0) | |
| rack-cors (1.1.1) | |
| rack (>= 2.0.0) | |
| rails (6.1.7) | |
| actioncable (= 6.1.7) | |
| actionmailbox (= 6.1.7) | |
| actionmailer (= 6.1.7) | |
| actionpack (= 6.1.7) | |
| actiontext (= 6.1.7) | |
| actionview (= 6.1.7) | |
| activejob (= 6.1.7) | |
| activemodel (= 6.1.7) | |
| activerecord (= 6.1.7) | |
| activestorage (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| bundler (>= 1.15.0) | |
| railties (= 6.1.7) | |
| sprockets-rails (>= 2.0.0) | |
| rails-erd (1.7.2) | |
| activerecord (>= 4.2) | |
| activesupport (>= 4.2) | |
| choice (~> 0.2.0) | |
| ruby-graphviz (~> 1.2) | |
| rails-html-sanitizer (1.4.3) | |
| loofah (~> 2.3) | |
| rails_semantic_logger (4.10.0) | |
| rack | |
| railties (>= 5.1) | |
| semantic_logger (~> 4.9) | |
| redis-namespace (1.9.0) | |
| redis (>= 4) | |
| rest-client (2.1.0) | |
| http-accept (>= 1.7.0, < 2.0) | |
| http-cookie (>= 1.0.2, < 2.0) | |
| mime-types (>= 1.16, < 4.0) | |
| netrc (~> 0.8) | |
| retriable (3.1.2) | |
| rollout (2.5.0) | |
| rspec-benchmark (0.6.0) | |
| benchmark-malloc (~> 0.2) | |
| benchmark-perf (~> 0.6) | |
| benchmark-trend (~> 0.4) | |
| rspec (>= 3.0) | |
| rspec-rails (4.0.2) | |
| actionpack (>= 4.2) | |
| activesupport (>= 4.2) | |
| railties (>= 4.2) | |
| rspec-core (~> 3.10) | |
| rspec-expectations (~> 3.10) | |
| rspec-mocks (~> 3.10) | |
| rspec-support (~> 3.10) | |
| rspec_junit_formatter (0.6.0) | |
| rspec-core (>= 2, < 4, != 2.12.0) | |
| ruby-oembed (0.12.0) | |
| sassc-rails (2.1.2) | |
| railties (>= 4.0.0) | |
| sassc (>= 2.0) | |
| sprockets (> 3.0) | |
| sprockets-rails | |
| tilt | |
| scout_apm (5.3.2) | |
| parser | |
| semantic_logger (4.12.0) | |
| concurrent-ruby (~> 1.0) | |
| shoulda-matchers (5.2.0) | |
| activesupport (>= 5.2.0) | |
| sidekiq (5.2.10) | |
| connection_pool (~> 2.2, >= 2.2.2) | |
| rack (~> 2.0) | |
| rack-protection (>= 1.5.0) | |
| redis (~> 4.5, < 4.6.0) | |
| sidekiq-inspeqtor (0.2.2) | |
| sidekiq (>= 4.0, < 6) | |
| sidekiq-instrumentation (2.1.0) | |
| opentracing (>= 0.3.1) | |
| sidekiq-scheduler (2.1.10) | |
| redis (>= 3, < 5) | |
| rufus-scheduler (~> 3.2) | |
| sidekiq (>= 3) | |
| tilt (>= 1.4.0) | |
| snappy (0.3.0) | |
| spring (2.1.1) | |
| spring-commands-rspec (1.0.4) | |
| spring (>= 0.9.1) | |
| spring-commands-rubocop (0.4.0) | |
| spring (>= 1.0) | |
| spring-watcher-listen (2.0.1) | |
| listen (>= 2.7, < 4.0) | |
| spring (>= 1.2, < 3.0) | |
| sprockets (4.1.1) | |
| concurrent-ruby (~> 1.0) | |
| rack (> 1, < 3) | |
| sprockets_uglifier_with_source_maps (2.1.0) | |
| sprockets-rails (~> 3.0) | |
| uglifier (>= 2.5) | |
| sql_spy (0.4.0) | |
| statsd-ruby (1.5.0) | |
| stimpack (0.3.0) | |
| rails | |
| thwait (0.2.0) | |
| e2mmap | |
| timecop (0.9.5) | |
| uglifier (4.2.0) | |
| execjs (>= 0.3.0, < 3) | |
| web-console (4.2.0) | |
| actionview (>= 6.0.0) | |
| activemodel (>= 6.0.0) | |
| bindex (>= 0.4.0) | |
| railties (>= 6.0.0) | |
| webmock (3.6.0) | |
| addressable (>= 2.3.6) | |
| crack (>= 0.3.2) | |
| hashdiff (>= 0.4.0, < 2.0.0) | |
| webpacker (5.4.3) | |
| activesupport (>= 5.2) | |
| rack-proxy (>= 0.6.1) | |
| railties (>= 5.2) | |
| semantic_range (>= 2.3.0) | |
| will_paginate (3.1.7) | |
| zeitwerk (2.6.3) | |
| GEM | |
| remote: https://custom.source/repository/gems_proxy/ | |
| specs: | |
| ======= | |
| >>>>>>> theirs | |
| actioncable (6.1.7) | |
| actionpack (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| nio4r (~> 2.0) | |
| websocket-driver (>= 0.6.1) | |
| actionmailbox (6.1.7) | |
| actionpack (= 6.1.7) | |
| activejob (= 6.1.7) | |
| activerecord (= 6.1.7) | |
| activestorage (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| mail (>= 2.7.1) | |
| actionmailer (6.1.7) | |
| actionpack (= 6.1.7) | |
| actionview (= 6.1.7) | |
| activejob (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| mail (~> 2.5, >= 2.5.4) | |
| rails-dom-testing (~> 2.0) | |
| actionpack (6.1.7) | |
| actionview (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| rack (~> 2.0, >= 2.0.9) | |
| rack-test (>= 0.6.3) | |
| rails-dom-testing (~> 2.0) | |
| rails-html-sanitizer (~> 1.0, >= 1.2.0) | |
| actiontext (6.1.7) | |
| actionpack (= 6.1.7) | |
| activerecord (= 6.1.7) | |
| activestorage (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| nokogiri (>= 1.8.5) | |
| actionview (6.1.7) | |
| activesupport (= 6.1.7) | |
| builder (~> 3.1) | |
| erubi (~> 1.4) | |
| rails-dom-testing (~> 2.0) | |
| rails-html-sanitizer (~> 1.1, >= 1.2.0) | |
| active_model_serializers (0.10.13) | |
| actionpack (>= 4.1, < 7.1) | |
| activemodel (>= 4.1, < 7.1) | |
| case_transform (>= 0.2) | |
| jsonapi-renderer (>= 0.1.1.beta1, < 0.3) | |
| activejob (6.1.7) | |
| activesupport (= 6.1.7) | |
| globalid (>= 0.3.6) | |
| activemodel (6.1.7) | |
| activesupport (= 6.1.7) | |
| activerecord (6.1.7) | |
| activemodel (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| activerecord-import (1.2.0) | |
| activerecord (>= 3.2) | |
| activerecord-instrumentation (0.6.1) | |
| activerecord | |
| opentracing (~> 0.5) | |
| activestorage (6.1.7) | |
| actionpack (= 6.1.7) | |
| activejob (= 6.1.7) | |
| activerecord (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| marcel (~> 1.0) | |
| mini_mime (>= 1.1.0) | |
| activesupport (6.1.7) | |
| concurrent-ruby (~> 1.0, >= 1.0.2) | |
| i18n (>= 1.6, < 2) | |
| minitest (>= 5.1) | |
| tzinfo (~> 2.0) | |
| zeitwerk (~> 2.3) | |
| addressable (2.8.1) | |
| public_suffix (>= 2.0.2, < 6.0) | |
| api-pagination (5.0.0) | |
| ast (2.4.2) | |
| avro (1.8.2) | |
| multi_json | |
| avro-patches (0.3.3) | |
| avro (= 1.8.2) | |
| avro_turf (1.8.0) | |
| avro (>= 1.7.7, < 1.12) | |
| excon (~> 0.71) | |
| aws_cf_signer (0.1.3) | |
| batcher (0.1.3) | |
| batchmaker (1.0.2) | |
| benchmark-malloc (0.2.0) | |
| benchmark-perf (0.6.0) | |
| benchmark-trend (0.4.0) | |
| better_html (1.0.16) | |
| actionview (>= 4.0) | |
| activesupport (>= 4.0) | |
| ast (~> 2.0) | |
| erubi (~> 1.4) | |
| html_tokenizer (~> 0.0.6) | |
| parser (>= 2.4) | |
| smart_properties | |
| bindex (0.8.1) | |
| bootsnap (1.13.0) | |
| msgpack (~> 1.2) | |
| brakeman (5.3.1) | |
| bugsnag (6.24.2) | |
| concurrent-ruby (~> 1.0) | |
| builder (3.2.4) | |
| bullet (7.0.3) | |
| activesupport (>= 3.0.0) | |
| uniform_notifier (~> 1.11) | |
| case_transform (0.2) | |
| activesupport | |
| choice (0.2.0) | |
| cloudinary (1.23.0) | |
| aws_cf_signer | |
| rest-client (>= 2.0.0) | |
| coderay (1.1.3) | |
| concurrent-ruby (1.1.10) | |
| connection_pool (2.3.0) | |
| constant_resolver (0.2.0) | |
| crack (0.4.3) | |
| safe_yaml (~> 1.0.0) | |
| crass (1.0.6) | |
| dalli (3.2.2) | |
| database_cleaner (2.0.1) | |
| database_cleaner-active_record (~> 2.0.0) | |
| database_cleaner-active_record (2.0.1) | |
| activerecord (>= 5.a) | |
| database_cleaner-core (~> 2.0.0) | |
| database_cleaner-core (2.0.1) | |
| db-query-matchers (0.11.0) | |
| activesupport (>= 4.0, < 7.1) | |
| rspec (>= 3.0) | |
| debug (1.6.2) | |
| irb (>= 1.3.6) | |
| reline (>= 0.3.1) | |
| deep_merge (1.2.2) | |
| departure (6.4.0) | |
| activerecord (>= 5.2.0, < 7.1, != 7.0.0) | |
| mysql2 (>= 0.4.0, <= 0.5.4) | |
| railties (>= 5.2.0, < 7.1, != 7.0.0) | |
| diff-lcs (1.5.0) | |
| digest (3.1.0) | |
| domain_name (0.5.20190701) | |
| unf (>= 0.0.5, < 1.0.0) | |
| dotenv (2.8.1) | |
| dotenv-rails (2.8.1) | |
| dotenv (= 2.8.1) | |
| railties (>= 3.2) | |
| e2mmap (0.1.0) | |
| elasticity-instrumentation (0.1.4) | |
| erubi (1.11.0) | |
| et-orbi (1.2.2) | |
| tzinfo | |
| excon (0.94.0) | |
| execjs (2.7.0) | |
| factory_bot (6.2.1) | |
| activesupport (>= 5.0.0) | |
| factory_bot_rails (6.2.0) | |
| factory_bot (~> 6.2.0) | |
| railties (>= 5.0.0) | |
| faker (3.0.0) | |
| i18n (>= 1.8.11, < 2) | |
| faraday (2.6.0) | |
| faraday-net_http (>= 2.0, < 3.1) | |
| ruby2_keywords (>= 0.0.4) | |
| faraday-net_http (3.0.1) | |
| ffi (1.15.5) | |
| ffi-compiler (1.0.1) | |
| ffi (>= 1.0.0) | |
| rake | |
| foreman (0.87.2) | |
| formatador (1.1.0) | |
| fugit (1.3.3) | |
| et-orbi (~> 1.1, >= 1.1.8) | |
| raabro (~> 1.1) | |
| globalid (1.0.0) | |
| activesupport (>= 5.0) | |
| google-protobuf (3.21.9) | |
| google-protobuf (3.21.9-x86_64-linux) | |
| googleapis-common-protos-types (1.4.0) | |
| google-protobuf (~> 3.14) | |
| graphql (2.0.7) | |
| graphql-client (0.18.0) | |
| activesupport (>= 3.0) | |
| graphql | |
| graphql-opentracing (0.4.6) | |
| opentracing (~> 0.5.0) | |
| grpc (1.50.0) | |
| google-protobuf (~> 3.21) | |
| googleapis-common-protos-types (~> 1.0) | |
| grpc (1.50.0-x86_64-linux) | |
| google-protobuf (~> 3.21) | |
| googleapis-common-protos-types (~> 1.0) | |
| guard (2.18.0) | |
| formatador (>= 0.2.4) | |
| listen (>= 2.7, < 4.0) | |
| lumberjack (>= 1.0.12, < 2.0) | |
| nenv (~> 0.1) | |
| notiffany (~> 0.0) | |
| pry (>= 0.13.0) | |
| shellany (~> 0.0) | |
| thor (>= 0.18.1) | |
| guard-compat (1.2.1) | |
| guard-rspec (4.7.3) | |
| guard (~> 2.1) | |
| guard-compat (~> 1.1) | |
| rspec (>= 2.99.0, < 4.0) | |
| guard-rubocop (1.5.0) | |
| guard (~> 2.0) | |
| rubocop (< 2.0) | |
| hashdiff (1.0.0) | |
| hashie (5.0.0) | |
| html_tokenizer (0.0.7) | |
| http (4.4.1) | |
| addressable (~> 2.3) | |
| http-cookie (~> 1.0) | |
| http-form_data (~> 2.2) | |
| http-parser (~> 1.2.0) | |
| http-accept (1.7.0) | |
| http-cookie (1.0.5) | |
| domain_name (~> 0.5) | |
| http-form_data (2.3.0) | |
| http-parser (1.2.3) | |
| ffi-compiler (>= 1.0, < 2.0) | |
| httprb-opentracing (0.5.3) | |
| opentracing (~> 0.5.0) | |
| i18n (1.12.0) | |
| concurrent-ruby (~> 1.0) | |
| ice_nine (0.11.2) | |
| <<<<<<< ours | |
| jaeger-client (1.3.0) | |
| opentracing (~> 0.3) | |
| thrift | |
| ||||||| base | |
| io-console (0.5.11) | |
| irb (1.4.2) | |
| reline (>= 0.3.0) | |
| ======= | |
| io-console (0.5.11) | |
| irb (1.4.2) | |
| reline (>= 0.3.0) | |
| jaeger-client (1.3.0) | |
| opentracing (~> 0.3) | |
| thrift | |
| >>>>>>> theirs | |
| json (2.6.2) | |
| json-schema (3.0.0) | |
| addressable (>= 2.8) | |
| jsonapi-renderer (0.2.2) | |
| jsonapi-serializer (2.2.0) | |
| activesupport (>= 4.2) | |
| jwt (1.5.6) | |
| kafka-opentracing (0.4.4) | |
| opentracing (~> 0.5.0) | |
| lightstep (0.17.0) | |
| concurrent-ruby (~> 1.0) | |
| opentracing (~> 0.5.0) | |
| listen (3.7.1) | |
| rb-fsevent (~> 0.10, >= 0.10.3) | |
| rb-inotify (~> 0.9, >= 0.9.10) | |
| loofah (2.19.0) | |
| crass (~> 1.0.2) | |
| nokogiri (>= 1.5.9) | |
| lumberjack (1.2.8) | |
| mail (2.7.1) | |
| mini_mime (>= 0.1.1) | |
| marcel (1.0.2) | |
| memory_profiler (1.0.0) | |
| method_source (1.0.0) | |
| mime-types (3.4.1) | |
| mime-types-data (~> 3.2015) | |
| mime-types-data (3.2022.0105) | |
| mini_mime (1.1.2) | |
| mini_portile2 (2.8.0) | |
| minitest (5.16.3) | |
| mpn-rb (0.1.1) | |
| rest-client (>= 2) | |
| msgpack (1.6.0) | |
| multi_json (1.15.0) | |
| multi_xml (0.6.0) | |
| mysql2 (0.5.4) | |
| nenv (0.3.0) | |
| nethttp-opentracing (0.1.5) | |
| opentracing (~> 0.3) | |
| netrc (0.11.0) | |
| nio4r (2.5.8) | |
| nokogiri (1.13.9) | |
| mini_portile2 (~> 2.8.0) | |
| racc (~> 1.4) | |
| nokogiri (1.13.9-x86_64-linux) | |
| racc (~> 1.4) | |
| notiffany (0.1.3) | |
| nenv (~> 0.1) | |
| shellany (~> 0.0) | |
| oauth2 (2.0.9) | |
| faraday (>= 0.17.3, < 3.0) | |
| jwt (>= 1.0, < 3.0) | |
| multi_xml (~> 0.5) | |
| rack (>= 1.2, < 4) | |
| snaky_hash (~> 2.0) | |
| version_gem (~> 1.1) | |
| oauth2c (1.2.0) | |
| http (~> 4) | |
| jwt (~> 1.5) | |
| omniauth (2.1.0) | |
| hashie (>= 3.4.6) | |
| rack (>= 2.2.3) | |
| rack-protection | |
| omniauth-oauth2 (1.8.0) | |
| oauth2 (>= 1.4, < 3) | |
| omniauth (~> 2.0) | |
| omniauth-rails_csrf_protection (1.0.1) | |
| actionpack (>= 4.2) | |
| omniauth (~> 2.0) | |
| opengraph_parser (0.2.5) | |
| addressable | |
| nokogiri | |
| openssl (3.0.1) | |
| opentracing (0.5.0) | |
| packwerk (2.2.0) | |
| activesupport (>= 5.2) | |
| ast | |
| better_html | |
| bundler | |
| constant_resolver (>= 0.2.0) | |
| digest | |
| parallel | |
| parser | |
| sorbet-runtime (>= 0.5.9914) | |
| paper_trail (12.0.0) | |
| activerecord (>= 5.2) | |
| request_store (~> 1.1) | |
| parallel (1.22.1) | |
| parser (3.1.2.1) | |
| ast (~> 2.4.1) | |
| prometheus-client (2.1.0) | |
| prop (2.6.1) | |
| pry (0.14.1) | |
| coderay (~> 1.1) | |
| method_source (~> 1.0) | |
| pry-rails (0.3.9) | |
| pry (>= 0.10.4) | |
| public_suffix (5.0.1) | |
| puma (5.6.5) | |
| nio4r (~> 2.0) | |
| pundit (2.2.0) | |
| activesupport (>= 3.0.0) | |
| raabro (1.1.6) | |
| racc (1.6.0) | |
| rack (2.2.4) | |
| rack-cors (1.1.1) | |
| rack (>= 2.0.0) | |
| rack-protection (3.0.2) | |
| rack | |
| rack-proxy (0.7.2) | |
| rack | |
| rack-test (2.0.2) | |
| rack (>= 1.3) | |
| rails (6.1.7) | |
| actioncable (= 6.1.7) | |
| actionmailbox (= 6.1.7) | |
| actionmailer (= 6.1.7) | |
| actionpack (= 6.1.7) | |
| actiontext (= 6.1.7) | |
| actionview (= 6.1.7) | |
| activejob (= 6.1.7) | |
| activemodel (= 6.1.7) | |
| activerecord (= 6.1.7) | |
| activestorage (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| bundler (>= 1.15.0) | |
| railties (= 6.1.7) | |
| sprockets-rails (>= 2.0.0) | |
| rails-dom-testing (2.0.3) | |
| activesupport (>= 4.2.0) | |
| nokogiri (>= 1.6) | |
| rails-erd (1.7.2) | |
| activerecord (>= 4.2) | |
| activesupport (>= 4.2) | |
| choice (~> 0.2.0) | |
| ruby-graphviz (~> 1.2) | |
| rails-html-sanitizer (1.4.3) | |
| loofah (~> 2.3) | |
| rails_semantic_logger (4.10.0) | |
| rack | |
| railties (>= 5.1) | |
| semantic_logger (~> 4.9) | |
| railties (6.1.7) | |
| actionpack (= 6.1.7) | |
| activesupport (= 6.1.7) | |
| method_source | |
| rake (>= 12.2) | |
| thor (~> 1.0) | |
| rainbow (3.1.1) | |
| rake (13.0.6) | |
| rb-fsevent (0.11.2) | |
| rb-inotify (0.10.1) | |
| ffi (~> 1.0) | |
| rdkafka (0.12.0) | |
| ffi (~> 1.15) | |
| mini_portile2 (~> 2.6) | |
| rake (> 12) | |
| redis (4.5.1) | |
| redis-instrumentation (0.2.0) | |
| opentracing (> 0.3) | |
| redis-namespace (1.9.0) | |
| redis (>= 4) | |
| regexp_parser (2.6.0) | |
| request_store (1.4.1) | |
| rack (>= 1.4) | |
| rest-client (2.1.0) | |
| http-accept (>= 1.7.0, < 2.0) | |
| http-cookie (>= 1.0.2, < 2.0) | |
| mime-types (>= 1.16, < 4.0) | |
| netrc (~> 0.8) | |
| retriable (3.1.2) | |
| rexml (3.2.5) | |
| rollout (2.5.0) | |
| rspec (3.10.0) | |
| rspec-core (~> 3.10.0) | |
| rspec-expectations (~> 3.10.0) | |
| rspec-mocks (~> 3.10.0) | |
| rspec-benchmark (0.6.0) | |
| benchmark-malloc (~> 0.2) | |
| benchmark-perf (~> 0.6) | |
| benchmark-trend (~> 0.4) | |
| rspec (>= 3.0) | |
| rspec-core (3.10.2) | |
| rspec-support (~> 3.10.0) | |
| rspec-expectations (3.10.2) | |
| diff-lcs (>= 1.2.0, < 2.0) | |
| rspec-support (~> 3.10.0) | |
| rspec-mocks (3.10.2) | |
| diff-lcs (>= 1.2.0, < 2.0) | |
| rspec-support (~> 3.10.0) | |
| rspec-rails (4.0.2) | |
| actionpack (>= 4.2) | |
| activesupport (>= 4.2) | |
| railties (>= 4.2) | |
| rspec-core (~> 3.10) | |
| rspec-expectations (~> 3.10) | |
| rspec-mocks (~> 3.10) | |
| rspec-support (~> 3.10) | |
| rspec-support (3.10.2) | |
| rspec_junit_formatter (0.6.0) | |
| rspec-core (>= 2, < 4, != 2.12.0) | |
| rubocop (1.36.0) | |
| json (~> 2.3) | |
| parallel (~> 1.10) | |
| parser (>= 3.1.2.1) | |
| rainbow (>= 2.2.2, < 4.0) | |
| regexp_parser (>= 1.8, < 3.0) | |
| rexml (>= 3.2.5, < 4.0) | |
| rubocop-ast (>= 1.20.1, < 2.0) | |
| ruby-progressbar (~> 1.7) | |
| unicode-display_width (>= 1.4.0, < 3.0) | |
| rubocop-ast (1.22.0) | |
| parser (>= 3.1.1.0) | |
| rubocop-performance (1.13.3) | |
| rubocop (>= 1.7.0, < 2.0) | |
| rubocop-ast (>= 0.4.0) | |
| rubocop-rails (2.14.0) | |
| activesupport (>= 4.2.0) | |
| rack (>= 1.1) | |
| rubocop (>= 1.7.0, < 2.0) | |
| rubocop-rspec (2.9.0) | |
| rubocop (~> 1.19) | |
| ruby-graphviz (1.2.5) | |
| rexml | |
| ruby-oembed (0.12.0) | |
| ruby-progressbar (1.11.0) | |
| ruby2_keywords (0.0.5) | |
| rufo (0.13.0) | |
| rufus-scheduler (3.6.0) | |
| fugit (~> 1.1, >= 1.1.6) | |
| safe_yaml (1.0.5) | |
| sassc (2.4.0) | |
| ffi (~> 1.9) | |
| sassc-rails (2.1.2) | |
| railties (>= 4.0.0) | |
| sassc (>= 2.0) | |
| sprockets (> 3.0) | |
| sprockets-rails | |
| tilt | |
| scout_apm (5.3.2) | |
| parser | |
| semantic (1.6.1) | |
| semantic_logger (4.12.0) | |
| concurrent-ruby (~> 1.0) | |
| semantic_range (3.0.0) | |
| shellany (0.0.1) | |
| <<<<<<< ours | |
| sidekiq-ent (1.8.1) | |
| einhorn (= 0.7.4) | |
| sidekiq (>= 5.2.3) | |
| sidekiq-pro (>= 4.0.4) | |
| sidekiq-instrumentation (2.1.0) | |
| opentracing (>= 0.3.1) | |
| sidekiq-pro (5.0.0) | |
| concurrent-ruby (>= 1.0.5) | |
| sidekiq (>= 5.2.7) | |
| ||||||| base | |
| sidekiq-ent (1.8.1) | |
| einhorn (= 0.7.4) | |
| sidekiq (>= 5.2.3) | |
| sidekiq-pro (>= 4.0.4) | |
| sidekiq-pro (5.0.0) | |
| concurrent-ruby (>= 1.0.5) | |
| sidekiq (>= 5.2.7) | |
| ======= | |
| shoulda-matchers (5.2.0) | |
| activesupport (>= 5.2.0) | |
| sidekiq (5.2.10) | |
| connection_pool (~> 2.2, >= 2.2.2) | |
| rack (~> 2.0) | |
| rack-protection (>= 1.5.0) | |
| redis (~> 4.5, < 4.6.0) | |
| sidekiq-inspeqtor (0.2.2) | |
| sidekiq (>= 4.0, < 6) | |
| sidekiq-instrumentation (2.1.0) | |
| opentracing (>= 0.3.1) | |
| sidekiq-scheduler (2.1.10) | |
| redis (>= 3, < 5) | |
| rufus-scheduler (~> 3.2) | |
| sidekiq (>= 3) | |
| tilt (>= 1.4.0) | |
| >>>>>>> theirs | |
| sidekiq_prometheus (1.2.0) | |
| prometheus-client (~> 2.0) | |
| rack |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment