From e051e9b1913790bd1b9336eac411e51e348f0d54 Mon Sep 17 00:00:00 2001
From: Jay Cribas <feverjay@gmail.com>
Date: Thu, 4 Jan 2018 15:30:22 -0800
Subject: [PATCH 1/3] Adds 2 new retro survey questions to yaml files

---
 src/data/questions.yaml         | 20 ++++++++++++++++++++
 src/data/survey-blueprints.yaml |  4 ++++
 2 files changed, 24 insertions(+)

diff --git a/src/data/questions.yaml b/src/data/questions.yaml
index 71b494b6..086a242d 100644
--- a/src/data/questions.yaml
+++ b/src/data/questions.yaml
@@ -9,6 +9,26 @@
 # - to add a new item, you'll need to generate a new UUID
 # - you should never replace an item completely while keeping the UUID the same
 # - if you don't know what you're doing, ask!
+-
+  id: 0578b6c2-2596-40cc-a7d6-6e0bf5313968
+  body: |
+    Please provide the URL(s) to all PR(s) submitted for your work this week:
+
+    "{{URL}}"
+  responseType: text
+  feedbackTypeId:  535c45b6-489b-43c0-83f0-6cc896c2411a
+  subjectType: project
+  active: true
+-
+  id: d47feb36-2d24-470c-9d4c-b76ecbf390d1
+  body: |
+    Describe how much of your original work plan you were able to complete:
+
+    "I originally planned to complete {{this much}} and completed {{this much}}..."
+  responseType: text
+  feedbackTypeId:  d526e02d-0617-48ab-b243-3b6054decb31
+  subjectType: member
+  active: true
 -
   id: cd350a14-8a70-4593-9801-30cedab3dc75
   body: |
diff --git a/src/data/survey-blueprints.yaml b/src/data/survey-blueprints.yaml
index d3442d2d..1c0861fa 100644
--- a/src/data/survey-blueprints.yaml
+++ b/src/data/survey-blueprints.yaml
@@ -12,6 +12,10 @@
   id: 9c88e611-774e-4b10-bd69-0c185b83adda
   descriptor: retrospective
   defaultQuestionRefs:
+    -
+      questionId: 0578b6c2-2596-40cc-a7d6-6e0bf5313968
+    -
+      questionId: d47feb36-2d24-470c-9d4c-b76ecbf390d1
     -
       questionId: cd350a14-8a70-4593-9801-30cedab3dc75
     -

From 7525e7bf8e9e2d9c6b58337a204391146da7ea76 Mon Sep 17 00:00:00 2001
From: Jay Cribas <feverjay@gmail.com>
Date: Fri, 5 Jan 2018 13:40:40 -0800
Subject: [PATCH 2/3] Changes feedbackTypeId to use feedback-types yaml

---
 src/data/questions.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/data/questions.yaml b/src/data/questions.yaml
index 086a242d..d289385c 100644
--- a/src/data/questions.yaml
+++ b/src/data/questions.yaml
@@ -14,9 +14,9 @@
   body: |
     Please provide the URL(s) to all PR(s) submitted for your work this week:
 
-    "{{URL}}"
+    "URL(s)"
   responseType: text
-  feedbackTypeId:  535c45b6-489b-43c0-83f0-6cc896c2411a
+  feedbackTypeId:  81b7085c-1c3e-4066-80a7-d5ac3b7fa838
   subjectType: project
   active: true
 -
@@ -24,10 +24,10 @@
   body: |
     Describe how much of your original work plan you were able to complete:
 
-    "I originally planned to complete {{this much}} and completed {{this much}}..."
+    "I originally planned to complete 'this much' and completed 'this much'..."
   responseType: text
-  feedbackTypeId:  d526e02d-0617-48ab-b243-3b6054decb31
-  subjectType: member
+  feedbackTypeId:  81b7085c-1c3e-4066-80a7-d5ac3b7fa838
+  subjectType: project
   active: true
 -
   id: cd350a14-8a70-4593-9801-30cedab3dc75

From 919142e30f1b83691a90f33b7f2e52091e864359 Mon Sep 17 00:00:00 2001
From: smithrm941 <smithrm941@gmail.com>
Date: Mon, 8 Jan 2018 13:25:41 -0800
Subject: [PATCH 3/3] changed word in one question; created db migration

---
 src/data/migrations/20180108132324-updateRetro.js | 8 ++++++++
 src/data/questions.yaml                           | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 src/data/migrations/20180108132324-updateRetro.js

diff --git a/src/data/migrations/20180108132324-updateRetro.js b/src/data/migrations/20180108132324-updateRetro.js
new file mode 100644
index 00000000..df14b4f0
--- /dev/null
+++ b/src/data/migrations/20180108132324-updateRetro.js
@@ -0,0 +1,8 @@
+export function up() {
+  const reloadDefaultModelData = require('src/server/actions/reloadDefaultModelData')
+  return reloadDefaultModelData()
+}
+
+export function down() {
+  // irreversible; data from dropped table not recoverable
+}
diff --git a/src/data/questions.yaml b/src/data/questions.yaml
index d289385c..02d2c994 100644
--- a/src/data/questions.yaml
+++ b/src/data/questions.yaml
@@ -12,7 +12,7 @@
 -
   id: 0578b6c2-2596-40cc-a7d6-6e0bf5313968
   body: |
-    Please provide the URL(s) to all PR(s) submitted for your work this week:
+    Please provide the URL(s) to any PR(s) submitted for your work this week:
 
     "URL(s)"
   responseType: text