Commit fe017479 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'easy-dev-install' into 'master'

Easy dev install

@jeroenvanbaarsen  just tried the following:

1. Removing therubyracer from gemfile
2. Install node (brew install node or sudo apt-get install nodejs)
3. Run $ spinach features/

All worked as before, so this would mean people have to install the node dependency on their local machine, but in my experience this is much easier than installing libv8, especially for non ruby-devs. /cc @jacobvosmaer

See merge request !262
parents f65bed6d 7fcd0e83
...@@ -175,7 +175,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0' ...@@ -175,7 +175,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
gem "sass-rails", '~> 4.0.2' gem "sass-rails", '~> 4.0.2'
gem "coffee-rails" gem "coffee-rails"
gem "uglifier" gem "uglifier"
gem "therubyracer"
gem 'turbolinks' gem 'turbolinks'
gem 'jquery-turbolinks' gem 'jquery-turbolinks'
...@@ -260,6 +259,7 @@ end ...@@ -260,6 +259,7 @@ end
group :production do group :production do
gem "gitlab_meta", '7.0' gem "gitlab_meta", '7.0'
gem "therubyracer"
end end
gem "newrelic_rpm" gem "newrelic_rpm"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment