diff options
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 27 | ||||
| -rw-r--r-- | config/boot.rb | 6 |
3 files changed, 31 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile index 771b8ab47..ddfa50ef1 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' gem 'paperclip-av-transcoder', '~> 0.6' gem 'streamio-ffmpeg', '~> 3.0' -gem 'blurhash', '~> 0.1' +gem 'blurhash', '~> 0.1', git: 'https://monsterware.dev/monsterpit/blurhash.git', ref: '8fbf184802b65d4a2c45ba1a1c2bad73916eeeec' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.6' @@ -142,7 +142,7 @@ group :development do gem 'capistrano-yarn', '~> 2.0' gem 'derailed_benchmarks' - gem 'stackprof' + gem 'fast_stack' end group :production do @@ -158,3 +158,5 @@ gem "ruby-bbcode", "~> 2.0" gem "sun_calc", "~> 0.1.0" gem "sixarm_ruby_unaccent", "~> 1.2" + +gem "sys-proctable", "~> 1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 2ac235c16..7041034c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,6 +26,14 @@ GIT specs: nilsimsa (1.1.2) +GIT + remote: https://monsterware.dev/monsterpit/blurhash.git + revision: 8fbf184802b65d4a2c45ba1a1c2bad73916eeeec + ref: 8fbf184802b65d4a2c45ba1a1c2bad73916eeeec + specs: + blurhash (0.1.4) + ffi (~> 1.10.0) + GEM remote: https://rubygems.org/ specs: @@ -113,8 +121,6 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - blurhash (0.1.4) - ffi (~> 1.10.0) bootsnap (1.4.5) msgpack (~> 1.0) brakeman (4.7.2) @@ -225,8 +231,10 @@ GEM faraday (1.0.0) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) + fast_stack (0.2.0) fastimage (2.1.7) ffi (1.10.0) + ffi (1.10.0-x64-mingw32) fog-core (2.1.0) builder excon (~> 0.58) @@ -368,6 +376,7 @@ GEM mini_portile2 (2.4.0) minitest (5.14.0) msgpack (1.3.1) + msgpack (1.3.1-x64-mingw32) multi_json (1.14.1) multipart-post (2.1.1) necromancer (0.5.1) @@ -378,6 +387,8 @@ GEM nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) + nokogiri (1.10.7-x64-mingw32) + mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) nsa (0.2.7) @@ -416,6 +427,7 @@ GEM equatable (~> 0.6) tty-color (~> 0.5) pg (1.2.2) + pg (1.2.2-x64-mingw32) pghero (2.4.1) activerecord (>= 5) pkg-config (1.4.0) @@ -601,7 +613,6 @@ GEM sshkit (1.20.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stackprof (0.2.15) statsd-ruby (1.4.0) stoplight (2.1.3) streamio-ffmpeg (3.0.2) @@ -609,6 +620,8 @@ GEM strong_migrations (0.5.1) activerecord (>= 5) sun_calc (0.1.0) + sys-proctable (1.2.2) + ffi temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -663,6 +676,7 @@ GEM PLATFORMS ruby + x64-mingw32 DEPENDENCIES active_model_serializers (~> 0.10) @@ -672,7 +686,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1.41) better_errors (~> 2.5) binding_of_caller (~> 0.7) - blurhash (~> 0.1) + blurhash (~> 0.1)! bootsnap (~> 1.4) brakeman (~> 4.5) browser @@ -697,6 +711,7 @@ DEPENDENCIES fabrication (~> 2.20) faker (~> 1.9) fast_blank (~> 1.0) + fast_stack fastimage fog-core (<= 2.1.0) fog-openstack (~> 0.3) @@ -775,11 +790,11 @@ DEPENDENCIES simplecov (~> 0.16) sixarm_ruby_unaccent (~> 1.2) sprockets-rails (~> 3.2) - stackprof stoplight (~> 2.1.3) streamio-ffmpeg (~> 3.0) strong_migrations (~> 0.4) sun_calc (~> 0.1.0) + sys-proctable (~> 1.2) thor (~> 0.20) tty-command (~> 0.8) tty-prompt (~> 0.19) @@ -793,4 +808,4 @@ RUBY VERSION ruby 2.6.1p33 BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/config/boot.rb b/config/boot.rb index f3e36203a..b5be679b5 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -3,6 +3,12 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. require 'bootsnap' # Speed up boot time by caching expensive operations. +if Gem.win_platform? + require 'ruby_installer/runtime' + RubyInstaller::Runtime.enable_dll_search_paths + RubyInstaller::Runtime.enable_msys_apps +end + Bootsnap.setup( cache_dir: File.expand_path('../tmp/cache', __dir__), development_mode: ENV.fetch('RAILS_ENV', 'development') == 'development', |