From efcaa860ace3a4ce444f3dbe3c63e0e65e0f1631 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 6 Jan 2019 17:36:47 +0100 Subject: [PATCH] Revert "Bump bootstrap-switch-rails" It looks like 3.3.4 is broken :( Fixes #7940 This reverts commit 5205e3c5266aaa006340c668a1cc1a2c79499a2d. closes #7955 --- Changelog.md | 1 + Gemfile | 2 +- Gemfile.lock | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 856d6e439..58e397eb4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ ## Bug fixes * Do not autofollow back a user you are ignoring [#7913](https://github.com/diaspora/diaspora/pull/7913) * Fix photos gallery when too many thumbnails are shown [#7943](https://github.com/diaspora/diaspora/pull/7943) +* Fix extended profile visibility switch showing the wrong state [#7955](https://github.com/diaspora/diaspora/pull/7955) ## Features * Suppoert ignore users on mobile [#7884](https://github.com/diaspora/diaspora/pull/7884) diff --git a/Gemfile b/Gemfile index 20cddde2a..b7ae543c9 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" gem "autoprefixer-rails", "8.6.5" gem "bootstrap-sass", "3.3.7" -gem "bootstrap-switch-rails", "3.3.4" +gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "compass-rails", "3.1.0" gem "sass-rails", "5.0.7" gem "sprockets-rails", "3.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 40e517274..e2f46878b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bootstrap-switch-rails (3.3.4) + bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.3) byebug (10.0.2) @@ -771,7 +771,7 @@ DEPENDENCIES asset_sync (= 2.5.0) autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.3.7) - bootstrap-switch-rails (= 3.3.4) + bootstrap-switch-rails (= 3.3.3) capybara (= 3.11.1) carrierwave (= 1.2.3) compass-rails (= 3.1.0)