Merge branch 'develop' into feature/replacesession

kleitz · Mar 16, 2016 · cef1f92 · cef1f92
2 parents 2e6849d + d76a3cd
commit cef1f92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/migrations/20160210123033-addcolumn_type.js b/migrations/20160210123033-addcolumn_type.js
@@ -14,7 +14,7 @@
             msg: 'Must be either Item, Event'
           }
         },
-        allowNull: false
+        allowNull: true
       });
     }
 

diff --git a/migrations/20160210124231-addcolumn_category_id.js b/migrations/20160210124231-addcolumn_category_id.js
@@ -6,7 +6,7 @@
     up: function(queryInterface, Sequelize) {
       return queryInterface.addColumn('Events', 'category_id', {
         type: Sequelize.INTEGER,
-        allowNull: false
+        allowNull: true
       });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
                 msg: 'Must be either Item, Event'
               }
             },
-            allowNull: false
+            allowNull: true
           });
         }
@@ Expand Down @@