Merge remote-tracking branch 'origin/master'

Weblate
2 parents 11a47974 f7c05bdf
Showing 2 changed files with 10 additions and 1 deletions Show diff stats
db/migrate/20150122165042_change_address_type_to_text_in_external_feed.rb
db/schema.rb
@@ -0,0 +1,9 @@
+class ChangeAddressTypeToTextInExternalFeed < ActiveRecord::Migration
+  def up
+    change_column :external_feeds, :address, :text
+  end
+
+  def down
+    change_column :external_feeds, :address, :string
+  end
+end
@@ -316,7 +316,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150113131617) do
   create_table "external_feeds", :force => true do |t|
     t.string   "feed_title"
     t.datetime "fetched_at"
-    t.string   "address"
+    t.text     "address"
     t.integer  "blog_id",                         :null => false
     t.boolean  "enabled",       :default => true, :null => false
     t.boolean  "only_once",     :default => true, :null => false
...	...	@@ -0,0 +1,9 @@
	1	+class ChangeAddressTypeToTextInExternalFeed < ActiveRecord::Migration
	2	+ def up
	3	+ change_column :external_feeds, :address, :text
	4	+ end
	5	+
	6	+ def down
	7	+ change_column :external_feeds, :address, :string
	8	+ end
	9	+end
...	...
...	...	@@ -316,7 +316,7 @@ ActiveRecord::Schema.define(:version => 20150113131617) do
316	316	create_table "external_feeds", :force => true do \|t\|
317	317	t.string "feed_title"
318	318	t.datetime "fetched_at"
319		- t.string "address"
	319	+ t.text "address"
320	320	t.integer "blog_id", :null => false
321	321	t.boolean "enabled", :default => true, :null => false
322	322	t.boolean "only_once", :default => true, :null => false
...	...