Unverified Commit 415713b6 authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Bump bootstrap-rails

parent 791c8f3f

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" 


# CSS



gem "bootstrap-sass", "3.3.6"

gem "bootstrap-sass", "3.3.7"

gem "compass-rails",  "2.0.5"

gem "sass-rails",     "5.0.4"

gem "autoprefixer-rails", "6.4.0.2"

Gemfile.lock

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ GEM 
      railties

    bcrypt (3.1.11)

    bindata (2.3.0)

    bootstrap-sass (3.3.6)

    bootstrap-sass (3.3.7)

      autoprefixer-rails (>= 5.2.1)

      sass (>= 3.3.4)

    bootstrap-switch-rails (3.3.3)
@@ -646,8 +646,8 @@ GEM 
      sprockets-rails

    rails-assets-autosize (3.0.15)

    rails-assets-blueimp-gallery (2.21.2)

    rails-assets-bootstrap (3.3.6)

      rails-assets-jquery (>= 1.9.1, < 3)

    rails-assets-bootstrap (3.3.7)

      rails-assets-jquery (>= 1.9.1, < 4)

    rails-assets-bootstrap-markdown (2.9.0)

      rails-assets-bootstrap (~> 3)

    rails-assets-diaspora_jsxc (0.1.5.develop.1)
@@ -920,7 +920,7 @@ DEPENDENCIES 
  asset_sync (= 1.1.0)

  autoprefixer-rails (= 6.4.0.2)

  backbone-on-rails (= 1.2.0.0)

  bootstrap-sass (= 3.3.6)

  bootstrap-sass (= 3.3.7)

  bootstrap-switch-rails (= 3.3.3)

  capybara (= 2.7.1)

  carrierwave (= 0.11.2)