Skip to content

Commit

Permalink
Revert "Lock boostrap-sass to 2.3.0.1 until this issue is fixed - twb…
Browse files Browse the repository at this point in the history
…s/bootstrap#7118"

Reverting because this causes another issue: twbs/bootstrap#6835
Fixes https://squish.ish.com.au/tasks/view/17768

This reverts commit 73e8523.
  • Loading branch information
nasa42 committed Apr 15, 2013
1 parent 22755f6 commit 8b6fe56
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Expand Up @@ -50,8 +50,7 @@ end
# in production environments by default.
group :assets do
gem 'sass-rails'
# Lock to 2.3.0.1 until this issue is fixed - https://github.com/twitter/bootstrap/issues/7118
gem 'bootstrap-sass', '2.3.0.1'
gem 'bootstrap-sass'
end

group :test, :development do
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -50,7 +50,7 @@ GEM
arel (3.0.2)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-java)
bootstrap-sass (2.3.0.1)
bootstrap-sass (2.3.1.0)
sass (~> 3.2)
bourne (1.4.0)
mocha (~> 0.13.2)
Expand Down Expand Up @@ -255,7 +255,7 @@ DEPENDENCIES
acts_as_list
acts_as_tree
annotate
bootstrap-sass (= 2.3.0.1)
bootstrap-sass
capybara
ci_reporter
closure-compiler
Expand Down

0 comments on commit 8b6fe56

Please sign in to comment.