Skip to content

Commit efcaa86

Browse files
committed
Revert "Bump bootstrap-switch-rails"
It looks like 3.3.4 is broken :( Fixes diaspora#7940 This reverts commit 5205e3c. closes diaspora#7955
1 parent 3f700c3 commit efcaa86

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
## Bug fixes
88
* Do not autofollow back a user you are ignoring [#7913](https://github.com/diaspora/diaspora/pull/7913)
99
* Fix photos gallery when too many thumbnails are shown [#7943](https://github.com/diaspora/diaspora/pull/7943)
10+
* Fix extended profile visibility switch showing the wrong state [#7955](https://github.com/diaspora/diaspora/pull/7955)
1011

1112
## Features
1213
* Suppoert ignore users on mobile [#7884](https://github.com/diaspora/diaspora/pull/7884)

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors"
5858

5959
gem "autoprefixer-rails", "8.6.5"
6060
gem "bootstrap-sass", "3.3.7"
61-
gem "bootstrap-switch-rails", "3.3.4"
61+
gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
6262
gem "compass-rails", "3.1.0"
6363
gem "sass-rails", "5.0.7"
6464
gem "sprockets-rails", "3.2.1"

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ GEM
6969
bootstrap-sass (3.3.7)
7070
autoprefixer-rails (>= 5.2.1)
7171
sass (>= 3.3.4)
72-
bootstrap-switch-rails (3.3.4)
72+
bootstrap-switch-rails (3.3.3)
7373
buftok (0.2.0)
7474
builder (3.2.3)
7575
byebug (10.0.2)
@@ -771,7 +771,7 @@ DEPENDENCIES
771771
asset_sync (= 2.5.0)
772772
autoprefixer-rails (= 8.6.5)
773773
bootstrap-sass (= 3.3.7)
774-
bootstrap-switch-rails (= 3.3.4)
774+
bootstrap-switch-rails (= 3.3.3)
775775
capybara (= 3.11.1)
776776
carrierwave (= 1.2.3)
777777
compass-rails (= 3.1.0)

0 commit comments

Comments
 (0)