nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Jonne Haß 2021-04-11 20:35:18 +02:00
commit 76f759d9f7
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -62,7 +62,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
gem "autoprefixer-rails", "10.2.4.0" gem "autoprefixer-rails", "10.2.4.0"
gem "bootstrap-sass", "3.4.1" gem "bootstrap-sass", "3.4.1"
gem "bootstrap-switch-rails", "3.3.5" gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
gem "compass-rails", "3.1.0" gem "compass-rails", "3.1.0"
gem "sass-rails", "5.0.7" gem "sass-rails", "5.0.7"
gem "sprockets-rails", "3.2.1" gem "sprockets-rails", "3.2.1"
@ -259,6 +259,8 @@ group :development do
gem "simplecov", "0.21.2", require: false gem "simplecov", "0.21.2", require: false
gem "turbo_dev_assets", "0.0.2" gem "turbo_dev_assets", "0.0.2"
gem "listen", "3.5.1"
end end
group :test do group :test do

8
Gemfile.lock
View file

@ -81,7 +81,7 @@ GEM
bootstrap-sass (3.4.1) bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0) sassc (>= 2.0.0)
bootstrap-switch-rails (3.3.5) bootstrap-switch-rails (3.3.3)
buftok (0.2.0) buftok (0.2.0)
builder (3.2.4) builder (3.2.4)
byebug (11.1.3) byebug (11.1.3)
@ -381,6 +381,9 @@ GEM
kostya-sigar (2.0.8) kostya-sigar (2.0.8)
leaflet-rails (1.6.0) leaflet-rails (1.6.0)
rails (>= 4.2.0) rails (>= 4.2.0)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
little-plugger (1.1.4) little-plugger (1.1.4)
logging (2.3.0) logging (2.3.0)
little-plugger (~> 1.1) little-plugger (~> 1.1)
@ -793,7 +796,7 @@ DEPENDENCIES
asset_sync (= 2.11.0) asset_sync (= 2.11.0)
autoprefixer-rails (= 10.2.4.0) autoprefixer-rails (= 10.2.4.0)
bootstrap-sass (= 3.4.1) bootstrap-sass (= 3.4.1)
bootstrap-switch-rails (= 3.3.5) bootstrap-switch-rails (= 3.3.3)
capybara (= 3.35.3) capybara (= 3.35.3)
carrierwave (= 1.3.2) carrierwave (= 1.3.2)
chrome_remote (= 0.3.0) chrome_remote (= 0.3.0)
@ -833,6 +836,7 @@ DEPENDENCIES
json-schema (= 2.8.1) json-schema (= 2.8.1)
json-schema-rspec (= 0.0.4) json-schema-rspec (= 0.0.4)
leaflet-rails (= 1.6.0) leaflet-rails (= 1.6.0)
listen (= 3.5.1)
logging-rails (= 0.6.0) logging-rails (= 0.6.0)
markdown-it-html5-embed (= 1.0.0) markdown-it-html5-embed (= 1.0.0)
markerb (= 1.1.0) markerb (= 1.1.0)