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ß 2020-01-22 21:09:20 +01:00
commit 1da075e30b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -25,6 +25,7 @@ Although the chat was never enabled per default and was marked as experimental,
## Refactor ## Refactor
* Set better example values for unicorn stdout/stderr log settings [#8058](https://github.com/diaspora/diaspora/pull/8058) * Set better example values for unicorn stdout/stderr log settings [#8058](https://github.com/diaspora/diaspora/pull/8058)
* Replace dependency on rails-assets.org with custom gems cache at gems.diasporafoundation.org [#8087](https://github.com/diaspora/diaspora/pull/8087)
## Bug fixes ## Bug fixes
* Fix error while trying to fetch some sites with invalid OpenGraph data [#8049](https://github.com/diaspora/diaspora/pull/8049) * Fix error while trying to fetch some sites with invalid OpenGraph data [#8049](https://github.com/diaspora/diaspora/pull/8049)

4
Gemfile
View file

@ -99,7 +99,7 @@ gem "js-routes", "1.4.7"
gem "js_image_paths", "0.1.1" gem "js_image_paths", "0.1.1"
gem "sprockets-es6", "0.9.2" gem "sprockets-es6", "0.9.2"
source "https://rails-assets.org" do source "https://gems.diasporafoundation.org" do
gem "rails-assets-jquery", "3.4.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery", "3.4.1" # Should be kept in sync with jquery-rails
gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-jquery.ui", "1.11.4"
@ -312,7 +312,7 @@ group :development, :test do
# Jasmine (client side application tests (JS)) # Jasmine (client side application tests (JS))
gem "jasmine", "3.4.0" gem "jasmine", "3.4.0"
gem "jasmine-jquery-rails", "2.0.3" gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://rails-assets.org" gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
gem "sinon-rails", "1.15.0" gem "sinon-rails", "1.15.0"
# For `assigns` in controller specs # For `assigns` in controller specs

2
Gemfile.lock
View file

@ -1,6 +1,6 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
remote: https://rails-assets.org/ remote: https://gems.diasporafoundation.org/
specs: specs:
actioncable (5.1.7) actioncable (5.1.7)
actionpack (= 5.1.7) actionpack (= 5.1.7)