diff --git a/Gemfile b/Gemfile index 98564f1..2a5856c 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.0.1' gem "therubyracer", group: :production -gem "less-rails" +gem 'less-rails', '2.3.3' gem "twitter-bootstrap-rails" gem 'haml-rails' diff --git a/Gemfile.lock b/Gemfile.lock index c24023b..5bb1255 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,6 @@ GEM haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) highline (1.6.19) - hike (1.2.3) htmlentities (4.3.1) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -84,12 +83,11 @@ GEM kaminari (>= 0.13.0) rails kgio (2.11.2) - less (2.6.0) - commonjs (~> 0.2.7) - less-rails (4.0.0) - actionpack (>= 4) - less (~> 2.6.0) - sprockets (>= 2) + less (2.3.3) + commonjs (~> 0.2.6) + less-rails (2.3.3) + actionpack (>= 3.1) + less (~> 2.3.1) libv8 (3.11.8.17) mail (2.7.1) mini_mime (>= 0.1.1) @@ -134,18 +132,13 @@ GEM sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - sprockets (2.10.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) sprockets-rails (2.0.0) therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref thor (0.20.3) thread_safe (0.3.6) - tilt (1.4.1) + tilt (2.0.9) turbolinks (1.3.0) coffee-rails twitter-bootstrap-rails (2.2.7) @@ -177,7 +170,7 @@ DEPENDENCIES jbuilder (~> 1.0.1) jquery-rails kaminari-bootstrap - less-rails + less-rails (= 2.3.3) mysql2 nokogiri rails (= 4.0.13)