Remove weeklies pin and add analytics service to gulpfile

HabitRPG · Jul 18, 2015 · 25ca89d · 25ca89d
1 parent 4d28c0b
commit 25ca89d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -36,12 +36,13 @@ var paths = {
     'bower_components/marked/lib/marked.js',
     'bower_components/hello/dist/hello.all.min.js',
     'node_modules/habitrpg/website/public/js/env.js',
-    
+
     'bower_components/ngCordova/dist/ng-cordova.min.js',
-    
+
     'scripts/app.js',
     'node_modules/habitrpg/common/script/public/config.js',
     'node_modules/habitrpg/common/script/public/userServices.js',
+    'node_modules/habitrpg/website/public/js/services/analyticsServices.js',
     'node_modules/habitrpg/website/public/js/services/challengeServices.js',
     'node_modules/habitrpg/website/public/js/services/memberServices.js',
     'node_modules/habitrpg/website/public/js/services/sharedServices.js',
@@ -54,10 +55,10 @@ var paths = {
 
     'bower_components/ionic/release/css/ionic.min.css',
     'bower_components/ionic/release/fonts/*',
-    
+
     'bower_components/js-emoji/emoji.css'
   ],
-  
+
   imageMin: [
     'node_modules/habitrpg/common/img/emoji/**/*'
   ],

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "gulp-sass": "^0.7.1",
     "gulp-stylus": "~1.0.0",
     "gulp-uglify": "~0.2.1",
-    "habitrpg": "HabitRPG/habitrpg#weeklies-pr-patch",
+    "habitrpg": "HabitRPG/habitrpg",
     "imagemin-pngquant": "^4.1.0",
     "lodash": "^3.8.0"
   },
@@ -30,4 +30,4 @@
   "cordovaPlatforms": [
     "ios"
   ]
-}
+}