Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/therubyracer only on linux #742

Merged
merged 2 commits into from
Feb 19, 2013
Merged

Bugfix/therubyracer only on linux #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a01221
Puts therubyracer in asset group and only install if on linux.
wilkie Feb 19, 2013
66bb57c
Updates therubyracer.
wilkie Feb 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ group :assets do
gem 'coffee-rails', "~> 3.2.2"
gem 'uglifier', "~> 1.0.0"
gem 'jquery-ui-rails', "~> 2.0.0"

# Many Linux environments do not have a javascript environment which is
# required by the asset generators. However, windows and os x have one
# provided by the system.
gem "therubyracer", "~> 0.11.3" unless RUBY_PLATFORM.match(/darwin|mswin/)
end

gem "haml", "~> 3.1.4"
Expand Down Expand Up @@ -68,5 +73,4 @@ end

group :test do
gem "webmock", "~> 1.6.4"
gem "therubyracer", "~> 0.9.9"
end
10 changes: 6 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ GEM
kgio (2.7.4)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.3.10.4)
libv8 (3.11.8.13)
libwebsocket (0.1.5)
addressable
libxml-ruby (2.3.3)
Expand Down Expand Up @@ -212,6 +212,7 @@ GEM
rdoc (3.12.1)
json (~> 1.4)
redcarpet (1.17.2)
ref (1.0.2)
rest-client (1.6.7)
mime-types (>= 1.16)
rsa (0.1.4)
Expand All @@ -238,8 +239,9 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
therubyracer (0.11.3)
libv8 (~> 3.11.8.12)
ref
thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand Down Expand Up @@ -324,7 +326,7 @@ DEPENDENCIES
sass-rails (~> 3.2.5)
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
therubyracer (~> 0.9.9)
therubyracer (~> 0.11.3)
thin (~> 1.5.0)
tire (~> 0.4.1)
twitter (~> 3.5.0)
Expand Down