DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3499 from betagouv/update-bootstrap-sass

Browse source 
Gem update bootstrap-sass (>= 3.4.1)
This commit is contained in:
LeSim 2019-02-25 13:42:34 +01:00 committed by GitHub
commit 8124035800
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -8,7 +8,7 @@ gem 'administrate'
gem 'after_party' gem 'after_party'
gem 'axlsx', '~> 3.0.0.pre' # https://github.com/randym/axlsx/issues/501#issuecomment-373640365 gem 'axlsx', '~> 3.0.0.pre' # https://github.com/randym/axlsx/issues/501#issuecomment-373640365
gem 'bcrypt' gem 'bcrypt'
gem 'bootstrap-sass', '~> 3.3.5' gem 'bootstrap-sass', '>= 3.4.1'
gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8' gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
gem 'browser' gem 'browser'
gem 'carrierwave' gem 'carrierwave'

6
Gemfile.lock
View file

@ -101,9 +101,9 @@ GEM
axlsx (>= 2.0, < 4) axlsx (>= 2.0, < 4)
bcrypt (3.1.12) bcrypt (3.1.12)
bindata (2.4.4) bindata (2.4.4)
bootstrap-sass (3.3.7) bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4) sassc (>= 2.0.0)
bootstrap-wysihtml5-rails (0.3.3.8) bootstrap-wysihtml5-rails (0.3.3.8)
railties (>= 3.0) railties (>= 3.0)
brakeman (4.3.1) brakeman (4.3.1)
@ -652,7 +652,7 @@ DEPENDENCIES
after_party after_party
axlsx (~> 3.0.0.pre) axlsx (~> 3.0.0.pre)
bcrypt bcrypt
bootstrap-sass (~> 3.3.5) bootstrap-sass (>= 3.4.1)
bootstrap-wysihtml5-rails (~> 0.3.3.8) bootstrap-wysihtml5-rails (~> 0.3.3.8)
brakeman brakeman
browser browser