From ece7caa14a0e0276993a34d5a7a60c17d6743e5c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 18 Feb 2014 13:59:52 +1100
Subject: [PATCH] Moving Darkswarm to new Angular version

---
 Gemfile                                        | 1 +
 Gemfile.lock                                   | 2 ++
 app/assets/javascripts/darkswarm/all.js.coffee | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3271c30756..444c61e884 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,7 @@ gem 'comfortable_mexican_sofa'
 gem 'simple_form', :github => 'RohanM/simple_form'
 
 gem 'unicorn'
+gem 'angularjs-rails'
 gem 'bugsnag'
 gem 'newrelic_rpm'
 gem 'haml'
diff --git a/Gemfile.lock b/Gemfile.lock
index 78b60d1977..4ac81171c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,6 +159,7 @@ GEM
     acts_as_list (0.1.4)
     addressable (2.3.3)
     andand (1.3.3)
+    angularjs-rails (1.2.13)
     ansi (1.4.2)
     arel (3.0.2)
     awesome_nested_set (2.1.5)
@@ -495,6 +496,7 @@ PLATFORMS
 
 DEPENDENCIES
   andand
+  angularjs-rails
   awesome_print
   aws-sdk
   bugsnag
diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 32580e15ee..1f2ecf155d 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -2,8 +2,10 @@
 #= require jquery_ujs
 #= require jquery-ui
 #= require spin
-#= require ../shared/angular
-#= require ../shared/angular-resource
+#
+#= require angular
+#= require angular-resource
+#
 #= require ../shared/jquery.timeago
 #= require foundation
 #= require ./shop
@@ -11,5 +13,3 @@
 
 $ ->
   $(document).foundation()
-
-