From 1d72f957059e19d86b29f1111cacde3f283eb10b Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Wed, 22 Jan 2020 13:15:22 +0100
Subject: [PATCH] Issue #8062 - Drop rails-assets.org.
and replace it with our own Gem cache. This isn't pretty, as we have to manage that one ourselves, and pushing updates requires a core-team member, but rails-assets.org has become way too unreliable for us to be a viable option.
closes #8087
---
Changelog.md | 1 +
Gemfile | 6 +++---
Gemfile.lock | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index 4389a0089d..098304bbee 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
## Refactor
* 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
* Fix error while trying to fetch some sites with invalid OpenGraph data [#8049](https://github.com/diaspora/diaspora/pull/8049)
diff --git a/Gemfile b/Gemfile
index 87a3965d4e..08653baa55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,7 +97,7 @@ gem "jquery-rails", "4.3.5"
gem "js-routes", "1.4.7"
gem "js_image_paths", "0.1.1"
-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.ui", "1.11.4"
@@ -173,7 +173,7 @@ gem "active_model_serializers", "0.9.7"
# XMPP chat dependencies
gem "diaspora-prosody-config", "0.0.7"
-gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-assets.org"
+gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasporafoundation.org"
# Tags
@@ -312,7 +312,7 @@ group :development, :test do
# Jasmine (client side application tests (JS))
gem "jasmine", "3.4.0"
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"
# For `assigns` in controller specs
diff --git a/Gemfile.lock b/Gemfile.lock
index a8c30bee37..d09c9e391a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GEM
remote: https://rubygems.org/
- remote: https://rails-assets.org/
+ remote: https://gems.diasporafoundation.org/
specs:
actioncable (5.1.7)
actionpack (= 5.1.7)
--
GitLab