Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'rails', '4.2.6'
gem 'pg'
gem 'active_record_union'
# Use bootstrap compiled from SASS
gem 'bootstrap-sass', '~> 3.3.6'
gem 'bootstrap-sass', '~> 3.4.1'
gem 'font-awesome-sass', '~> 4.7.0'
# UIkit para estilos diversos
gem 'bootstrap-datepicker-rails', :require => 'bootstrap-datepicker-rails', :git => 'https://github.com/Nerian/bootstrap-datepicker-rails.git'
Expand Down
20 changes: 15 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.4)
autoprefixer-rails (6.3.6.2)
autoprefixer-rails (9.7.2)
execjs
bcrypt (3.1.11)
bindata (2.3.5)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
builder (3.2.3)
byebug (9.0.6)
capistrano (3.4.1)
Expand Down Expand Up @@ -97,6 +97,7 @@ GEM
warden (~> 1.2.3)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.11.3)
figaro (1.1.1)
thor (~> 0.14)
font-awesome-sass (4.7.0)
Expand Down Expand Up @@ -168,17 +169,26 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdoc (4.3.0)
remotipart (1.3.1)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
sass (3.4.24)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.2.1)
ffi (~> 1.9)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
Expand Down Expand Up @@ -224,7 +234,7 @@ DEPENDENCIES
active_record_union
activerecord-sqlserver-adapter
bootstrap-datepicker-rails!
bootstrap-sass (~> 3.3.6)
bootstrap-sass (~> 3.4.1)
byebug
capistrano (~> 3.4.0)
capistrano-bundler
Expand Down