Merge branch 'master' into beta

Normally we wouldn't do this for anything other than beta 0. However,
in this case, it's fine because everything that went in is either
extremely low-risk or a high-impact bug that we would've backported
via cherry-pick anyway - and merging rather than cherry-picking
results in a cleaner history.

.travis.yml

@@ -11,7 +11,7 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
-script: "npm test && sudo $(which npm) run test-root"
+script: "npm test && sudo $(which npm) run test-root && npm run test:install"
 before_script:
   - "./test/hosts.sh"
 before_install:

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 pump.io follows [Semantic Versioning][semver].
 
+## 3.0.0 beta 1 - 2017-02-15
+
+### Improved
+
+* Improve performance of front-page image
+
+### Fixed
+
+* Fix the web UI repeating YouTube videos (again)
+* Fix direct visits to /following URLs not rendering layout (#1279)
+
 ## 3.0.0 beta 0 - 2017-02-01
 
 ### Improved

package.json

@@ -75,6 +75,7 @@
     "postinstall": "npm run build",
     "test": "npm run lint && vows -v test/*-test.js",
     "test-root": "vows -v test/*-test-as-root.js",
+    "test:install": "sudo $(which npm) install -g .",
     "lint": "npm run lint:jshint && npm run lint:jscs && npm run lint:jade",
     "lint:jshint": "jshint --exclude 'public/javascript/libs' bin/* routes",
     "lint:jscs": "jscs bin/* lib public/javascript/pump* routes test",

public/javascript/pump/view.js

@@ -198,6 +198,7 @@
                                           "error",
                                           "favorites",
                                           "followers",
+                                          "following",
                                           "inbox",
                                           "javascript-disabled",
                                           "list",

public/template/following-client.jade

@@ -0,0 +1,12 @@
+.user.user-following
+  .row
+    .span12
+      include ./profile-block.jade
+
+  .row
+    .span12
+      include ./profile-nav.jade
+
+  .row
+    .span12#user-content
+      include ./user-content-following.jade

public/template/following.jade

@@ -1,12 +1,5 @@
-.user.user-following
-  .row
-    .span12
-      include ./profile-block.jade
+extends ./layout.jade
 
-  .row
-    .span12
-      include ./profile-nav.jade
+block body
 
-  .row
-    .span12#user-content
-      include ./user-content-following.jade
+  include following-client.jade

public/template/major-activity.jade

@@ -51,7 +51,7 @@ unless object.deleted
             - var yt = String(object.content.match(/www\.youtube\.com\/watch\?v=[a-zA-Z0-9_-]*/))
           if yt
             iframe(width="420", height="315", frameborder="0", src="//www.youtube.com/embed/" + yt.substring(yt.indexOf('?v=')+3, yt.length), allowfullscreen)
-            - delete yt
+            - yt = '';
 
         if principal
           - var obj = object;