scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 05:02:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1031 from ZmagoD/zd_SCI_2140

Browse source 
update bootstrap to v 3.3.7 [fixes SCI-2140]
This commit is contained in:
Zmago Devetak 2018-03-12 09:45:04 +01:00 committed by GitHub
commit a61231e005
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -9,7 +9,7 @@ gem 'pg', '~> 0.18'
gem 'devise', '~> 4.3.0'
gem 'devise_invitable'
gem 'simple_token_authentication', '~> 1.15.1' # Token authentication for Devise
gem 'bootstrap-sass', '~> 3.3.5'
gem 'bootstrap-sass', '~> 3.3.7'
gem 'sass-rails', '~> 5.0.6'
gem 'bootstrap_form'
gem 'yomu'

2
Gemfile.lock
View file

@ -517,7 +517,7 @@ DEPENDENCIES
bcrypt (~> 3.1.10)
better_errors
binding_of_caller
bootstrap-sass (~> 3.3.5)
bootstrap-sass (~> 3.3.7)
bootstrap-select-rails (~> 1.6.3)
bootstrap3-datetimepicker-rails (~> 4.15.35)
bootstrap_form