cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: c5071f2) | patch

author	Eugen Rochko <eugen@zeonfederated.com>
	Sun, 3 Feb 2019 02:59:51 +0000 (03:59 +0100)
committer	GitHub <noreply@github.com>
	Sun, 3 Feb 2019 02:59:51 +0000 (03:59 +0100)
commit	d14c276e58f0f223b0e4889d342a948c961081b2
tree	f25b687f755725ee58b80ab2281dc368f5dc42eb	tree \| snapshot
parent	c5071f2d787e81251c2b3111074b20d94773ee44	commit \| diff

Add option to overwrite imported data (#9962)

* Add option to overwrite imported data

Fix #7465

* Add import for domain blocks

12 files changed:

app/models/account_domain_block.rb		diff \| blob \| history
app/models/concerns/domain_normalizable.rb		diff \| blob \| history
app/models/export.rb		diff \| blob \| history
app/models/import.rb		diff \| blob \| history
app/services/import_service.rb	[new file with mode: 0644]	blob
app/views/settings/imports/show.html.haml		diff \| blob \| history
app/workers/import/relationship_worker.rb		diff \| blob \| history
app/workers/import_worker.rb		diff \| blob \| history
config/locales/en.yml		diff \| blob \| history
db/migrate/20190201012802_add_overwrite_to_imports.rb	[new file with mode: 0644]	blob
db/schema.rb		diff \| blob \| history
spec/models/concerns/account_interactions_spec.rb		diff \| blob \| history

source code fur Kibicat Mastodon