diff --git a/Gemfile.lock b/Gemfile.lock index 78e4efa..cc0a629 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,8 @@ GEM builder (3.2.4) byebug (11.0.1) climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -90,8 +92,8 @@ GEM method_source (0.9.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mime-types-data (3.2020.0512) + mimemagic (0.3.0) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -99,12 +101,12 @@ GEM nokogiri (1.10.7) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - paperclip (6.1.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) + paperclip (4.3.7) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) + mimemagic (= 0.3.0) puma (4.3.1) nio4r (~> 2.0) rack (2.1.1) @@ -164,8 +166,6 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) @@ -185,7 +185,7 @@ GEM railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) PLATFORMS ruby @@ -200,7 +200,7 @@ DEPENDENCIES jquery-rails listen (~> 3.0.5) masonry-rails (~> 0.2.4) - paperclip (>= 5.2.0) + paperclip (~> 4.3, >= 4.3.6) puma (>= 3.12.2) rails (~> 5.0.4) sass-rails (~> 5.0)