diff --git a/Gemfile b/Gemfile index c5df09ba..5414b96e 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ end gem 'uglifier' gem 'less-rails' -gem 'twitter-bootstrap-rails', '~> 2.2.8' +gem 'twitter-bootstrap-rails', '~> 3.2.2' gem 'sass-rails', '~> 3.2.3' gem 'sass' diff --git a/Gemfile.lock b/Gemfile.lock index 8d88831f..9a45f3ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -277,10 +277,10 @@ GEM polyglot polyglot (>= 0.3.1) ttfunk (1.5.1) - twitter-bootstrap-rails (2.2.8) + twitter-bootstrap-rails (3.2.2) actionpack (>= 3.1) - execjs - rails (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) railties (>= 3.1) tzinfo (0.3.55) uglifier (4.1.20) @@ -344,7 +344,7 @@ DEPENDENCIES therubyracer (= 0.11.4) thin tinymce-rails - twitter-bootstrap-rails (~> 2.2.8) + twitter-bootstrap-rails (~> 3.2.2) uglifier validate_url wicked_pdf (= 1.1.0)