diff --git a/app/models/concerns/extra.rb b/app/models/concerns/extra.rb
index 97189c3..6b46adb 100644
--- a/app/models/concerns/extra.rb
+++ b/app/models/concerns/extra.rb
@@ -26,7 +26,7 @@ module Extra
end
def bbcode_to_html(text)
- Sanitize.clean(text.to_s).bbcode_to_html.gsub(/\r/, "
").html_safe
+ Sanitize.clean(text.to_s).bbcode_to_html.gsub(/\n|\r\n/, "
").html_safe
end
def move_up(scope, column = "position")
diff --git a/db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb b/db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb
new file mode 100644
index 0000000..fe2024a
--- /dev/null
+++ b/db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb
@@ -0,0 +1,5 @@
+class ChangeTypeOfProfileParsedSignature < ActiveRecord::Migration
+ def up
+ change_column :profiles, :signature_parsed, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 649d7e2..a464f43 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20170304191254) do
+ActiveRecord::Schema.define(:version => 20170612182124) do
create_table "admin_requests", :force => true do |t|
t.string "addr"
@@ -432,6 +432,18 @@ ActiveRecord::Schema.define(:version => 20170304191254) do
t.integer "category_id"
end
+ create_table "match_proposals", :force => true do |t|
+ t.integer "match_id"
+ t.integer "team_id"
+ t.integer "status"
+ t.datetime "proposed_time"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ add_index "match_proposals", ["match_id"], :name => "index_match_proposals_on_match_id"
+ add_index "match_proposals", ["team_id"], :name => "index_match_proposals_on_team_id"
+
create_table "matchers", :force => true do |t|
t.integer "match_id", :null => false
t.integer "user_id", :null => false
@@ -637,7 +649,7 @@ ActiveRecord::Schema.define(:version => 20170304191254) do
t.boolean "notify_challenge", :default => true, :null => false
t.string "steam_profile"
t.string "achievements_parsed"
- t.string "signature_parsed"
+ t.text "signature_parsed"
t.string "stream"
t.string "layout"
end