merge with master

Leandro Santos
2 parents 886ffb3e e156d9fc
Showing 2 changed files with 6 additions and 1 deletions Show diff stats
app/views/content_viewer/blog_page.html.erb
db/schema.rb
@@ -4,7 +4,7 @@
  
 <div>
   <div class='blog-description'>
-    <%= blog.body.html_safe %>
+    <%= (blog.body || '').html_safe %>
   </div>
 </div>
 <hr class="pre-posts"/>
@@ -290,8 +290,13 @@ ActiveRecord::Schema.define(version: 20160422163123) do
     t.string   "referrer"
     t.text     "settings"
     t.integer  "paragraph_id"
+<<<<<<< HEAD
+=======
+    t.string   "paragraph_uuid"
+>>>>>>> master
   end
  
+  add_index "comments", ["paragraph_uuid"], name: "index_comments_on_paragraph_uuid", using: :btree
   add_index "comments", ["source_id", "spam"], name: "index_comments_on_source_id_and_spam", using: :btree
  
   create_table "contact_lists", force: :cascade do |t|
...	...	@@ -4,7 +4,7 @@
4	4
5	5	<div>
6	6	<div class='blog-description'>
7		- <%= blog.body.html_safe %>
	7	+ <%= (blog.body \|\| '').html_safe %>
8	8	</div>
9	9	</div>
10	10	<hr class="pre-posts"/>
...	...
...	...	@@ -290,8 +290,13 @@ ActiveRecord::Schema.define(version: 20160422163123) do
290	290	t.string "referrer"
291	291	t.text "settings"
292	292	t.integer "paragraph_id"
	293	+<<<<<<< HEAD
	294	+=======
	295	+ t.string "paragraph_uuid"
	296	+>>>>>>> master
293	297	end
294	298
	299	+ add_index "comments", ["paragraph_uuid"], name: "index_comments_on_paragraph_uuid", using: :btree
295	300	add_index "comments", ["source_id", "spam"], name: "index_comments_on_source_id_and_spam", using: :btree
296	301
297	302	create_table "contact_lists", force: :cascade do \|t\|
...	...