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 @@ -37,7 +37,7 @@ gem "oink"
# Haml replaces erb
gem 'haml'
# Bootstrap and sass for page layouts
gem 'bootstrap-sass', '~> 3.3.4'
gem 'bootstrap-sass', '~> 3.4.1'
# Use Simpleform to create forms with complete html input
gem 'simple_form'
# Use Devise for user authentication system
Expand Down
27 changes: 18 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,14 @@ GEM
alphabetical_paginate (2.2.3)
ansi (1.5.0)
arel (6.0.0)
autoprefixer-rails (5.1.7.1)
autoprefixer-rails (9.7.0)
execjs
json
bcrypt (3.1.10)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap-will_paginate (0.0.10)
will_paginate
builder (3.2.2)
Expand All @@ -72,7 +71,8 @@ GEM
warden (~> 1.2.3)
erubis (2.7.0)
eventmachine (1.0.5)
execjs (2.4.0)
execjs (2.7.0)
ffi (1.11.1)
get_process_mem (0.2.0)
globalid (0.3.3)
activesupport (>= 4.1.0)
Expand All @@ -90,7 +90,7 @@ GEM
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
json (1.8.6)
kgio (2.9.3)
loofah (2.0.1)
nokogiri (>= 1.5.9)
Expand Down Expand Up @@ -169,17 +169,26 @@ GEM
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.4.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (4.2.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
ruby-progressbar (1.10.1)
sass (3.4.13)
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.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sassc (2.2.1)
ffi (~> 1.9)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
Expand Down Expand Up @@ -240,7 +249,7 @@ PLATFORMS

DEPENDENCIES
alphabetical_paginate
bootstrap-sass (~> 3.3.4)
bootstrap-sass (~> 3.4.1)
bootstrap-will_paginate
byebug
coffee-rails (~> 4.1.0)
Expand Down