diff --git a/Gemfile b/Gemfile index 5ab8204..bdeaad5 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'coffee-rails', '~> 4.0.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Add Bootstrap -gem 'bootstrap-sass', github: 'thomas-mcdonald/bootstrap-sass', branch: '3' +gem 'bootstrap-sass', '~> 3.0.3.0' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index c486355..fd8b985 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: git://github.com/thomas-mcdonald/bootstrap-sass.git - revision: 9c6c07f74ff515cf38380b014cfede14a4f0eae4 - branch: 3 - specs: - bootstrap-sass (3.0.0.0) - sass (~> 3.2) - GEM remote: https://rubygems.org/ specs: @@ -42,6 +34,8 @@ GEM nokogiri (>= 1.4.4) uuidtools (~> 2.1) bcrypt-ruby (3.1.2) + bootstrap-sass (3.0.3.0) + sass (~> 3.2) bootstrap-will_paginate (0.0.10) will_paginate builder (3.1.4) @@ -171,7 +165,7 @@ PLATFORMS DEPENDENCIES acts_as_follower aws-sdk (~> 1.5.7) - bootstrap-sass! + bootstrap-sass (~> 3.0.3.0) bootstrap-will_paginate coffee-rails (~> 4.0.0) devise (~> 3.1.1)