diff --git a/Gemfile b/Gemfile index 85225e1..efba6d5 100644 --- a/Gemfile +++ b/Gemfile @@ -27,8 +27,9 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.0.1' -gem "therubyracer", group: :production -gem 'less-rails', github: 'metaskills/less-rails', branch: 'depends_only_on_less_files' +gem "therubyracer", "0.12.3" #, group: :production +#gem 'less-rails', github: 'metaskills/less-rails', branch: 'depends_only_on_less_files' +gem 'less-rails' gem "twitter-bootstrap-rails" gem 'haml-rails' diff --git a/Gemfile.lock b/Gemfile.lock index fb83eec..aaf8fba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,17 +5,6 @@ GIT formtastic (2.3.0.rc2) actionpack (>= 3.0) -GIT - remote: git://github.com/metaskills/less-rails.git - revision: c34a9dc78b793a2f31e1917065f36f7201608365 - branch: depends_only_on_less_files - specs: - less-rails (2.7.1) - actionpack (>= 4.0) - less (~> 2.6.0) - sprockets (> 2, < 4) - tilt - GEM remote: https://rubygems.org/ specs: @@ -96,7 +85,11 @@ GEM kgio (2.11.2) less (2.6.0) commonjs (~> 0.2.7) - libv8 (3.11.8.17) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) + libv8 (3.16.14.19) mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -135,7 +128,7 @@ GEM rake (12.3.3) rdoc (3.12.2) json (~> 1.4) - ref (1.0.5) + ref (2.0.0) rmagick (3.1.0) rvm-capistrano (1.4.1) capistrano (>= 2.0.0) @@ -149,8 +142,8 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - therubyracer (0.11.4) - libv8 (~> 3.11.8.12) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref thor (0.20.3) thread_safe (0.3.6) @@ -189,14 +182,14 @@ DEPENDENCIES jbuilder (~> 1.0.1) jquery-rails kaminari-bootstrap - less-rails! + less-rails mysql2 nokogiri rails (= 4.0.6) rmagick rvm-capistrano sdoc - therubyracer + therubyracer (= 0.12.3) turbolinks twitter-bootstrap-rails uglifier (~> 2.7)