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 @@ -6,7 +6,7 @@ gem 'rails', '4.2.5'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'

gem 'bootstrap-sass', '~> 3.3.6'
gem 'bootstrap-sass', '~> 3.4.1'

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
Expand Down
14 changes: 9 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (6.0.4)
autoprefixer-rails (9.6.1.1)
autoprefixer-rails (9.6.5)
execjs
backports (3.15.0)
bcrypt (3.1.13)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
Expand Down Expand Up @@ -156,6 +156,7 @@ GEM
nifty-generators (0.4.6)
nokogiri (1.6.7)
mini_portile2 (~> 2.0.0.rc2)
pg (1.1.4)
public_suffix (3.1.1)
rack (1.6.11)
rack-test (0.6.3)
Expand Down Expand Up @@ -227,6 +228,8 @@ GEM
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 @@ -282,7 +285,7 @@ PLATFORMS

DEPENDENCIES
bcrypt-ruby
bootstrap-sass (~> 3.3.6)
bootstrap-sass (~> 3.4.1)
byebug
coffee-rails (~> 4.1.0)
cucumber
Expand All @@ -295,6 +298,7 @@ DEPENDENCIES
jquery-rails
nifty-generators
nokogiri (= 1.6.7)
pg
rails (= 4.2.5)
rails3-jquery-autocomplete
rails_12factor
Expand All @@ -304,7 +308,7 @@ DEPENDENCIES
selenium-webdriver
slim-rails
spring
sqlite3 (~> 1.3.6)
sqlite3
turbolinks
twitter-bootstrap-rails
uglifier (>= 1.3.0)
Expand Down