tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
This commit is contained in:
David Yip
2018-05-03 17:23:44 -05:00
parent 3a47842223 a7e71bbd08
commit c816701550
437 changed files with 5999 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/mute.rb
View File

@ -3,12 +3,12 @@
#
# Table name: mutes
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
# hide_notifications :boolean default(TRUE), not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
#
class Mute < ApplicationRecord