From 607ab6c0d6c998542a64746eebd3ff88fb409e86 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 5 May 2017 13:14:34 -0600
Subject: [PATCH 1/2] Added privacy fix

---
 models/user.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/models/user.js b/models/user.js
index 159407fdf..95a1422f2 100644
--- a/models/user.js
+++ b/models/user.js
@@ -136,6 +136,14 @@ const UserSchema = new mongoose.Schema({
   timestamps: {
     createdAt: 'created_at',
     updatedAt: 'updated_at'
+  },
+
+  toJSON: {
+    transform: function (doc, ret) {
+      delete ret.password;
+      delete ret._id;
+      delete ret.__v;
+    }
   }
 });
 

From 85fae3104e475889cfd85316813f642e66bfc0f6 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 5 May 2017 14:05:52 -0600
Subject: [PATCH 2/2] float: right; in css is just fine.

---
 .../coral-configure/components/ConfigureCommentStream.css   | 6 ++----
 client/coral-configure/components/ConfigureCommentStream.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/coral-configure/components/ConfigureCommentStream.css b/client/coral-configure/components/ConfigureCommentStream.css
index 335c94377..a8cbc36cb 100644
--- a/client/coral-configure/components/ConfigureCommentStream.css
+++ b/client/coral-configure/components/ConfigureCommentStream.css
@@ -3,10 +3,8 @@
 }
 
 .apply {
-  position: absolute;
-  top: 38%;
-  transform: translateX(-50%);
-  right: 0;
+  float: right;
+  margin: 0 10px;
 }
 
 .wrapper ul {
diff --git a/client/coral-configure/components/ConfigureCommentStream.js b/client/coral-configure/components/ConfigureCommentStream.js
index bef53e1ef..6c00b5996 100644
--- a/client/coral-configure/components/ConfigureCommentStream.js
+++ b/client/coral-configure/components/ConfigureCommentStream.js
@@ -12,7 +12,6 @@ export default ({handleChange, handleApply, changed, ...props}) => (
     <div className={styles.wrapper}>
       <div className={styles.container}>
         <h3>{lang.t('configureCommentStream.title')}</h3>
-        <p>{lang.t('configureCommentStream.description')}</p>
         <Button
           type="submit"
           className={styles.apply}
@@ -20,6 +19,7 @@ export default ({handleChange, handleApply, changed, ...props}) => (
           cStyle={changed ? 'green' : 'darkGrey'} >
           {lang.t('configureCommentStream.apply')}
         </Button>
+        <p>{lang.t('configureCommentStream.description')}</p>
       </div>
       <ul>
         <li>