Merge branch 'yolo-ugent' of github.com:ZeusWPI/Gandalf into yolo-ugent

ZeusWPI · Jan 8, 2017 · 936c57d · 936c57d
2 parents 673c26d + d0ad813
commit 936c57d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,7 +19,9 @@ gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-gem 'therubyracer', platforms: :ruby
+install_if -> {RUBY_PLATFORM !~ /darwin/} do
+  gem 'therubyracer', platforms: :ruby
+end
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     jwt (1.5.1)
-    libv8 (3.16.14.11)
+    libv8 (3.16.14.17)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -308,8 +308,8 @@ GEM
       net-ssh (>= 2.8.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -406,4 +406,4 @@ DEPENDENCIES
   will_paginate-bootstrap
 
 BUNDLED WITH
-   1.10.6
+   1.13.7