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

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

author	David Yip <yipdw@member.fsf.org>
	Thu, 3 May 2018 22:23:44 +0000 (17:23 -0500)
committer	David Yip <yipdw@member.fsf.org>
	Thu, 3 May 2018 22:23:44 +0000 (17:23 -0500)
commit	c816701550d7cdb593371dc47d0b9430c78308b0
tree	cc4417d14de20e69fd5f9a58d66f84af4a623329	tree \| snapshot
parent	3a47842223ff93d8c057f804809f1b111dfd6f76	commit \| diff
parent	a7e71bbd08e089938fbf20ddef5768c2f3ee0702	commit \| diff

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

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

43 files changed:

.env.production.sample	diff1 \|	diff2 \|	blob \| history
Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/statuses_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/stream_entries_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/core/admin.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/ja.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/pl.json	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/feed_manager.rb	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/concerns/account_interactions.rb	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/models/mute.rb	diff1 \|	diff2 \|	blob \| history
app/models/status.rb	diff1 \|	diff2 \|	blob \| history
app/models/stream_entry.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/policies/status_policy.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/reports/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/home/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/stream_entries/_simple_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/application.rb	diff1 \|	diff2 \|	blob \| history
config/environments/production.rb	diff1 \|	diff2 \|	blob \| history
config/locales/ca.yml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/es.yml	diff1 \|	diff2 \|	blob \| history
config/locales/fr.yml	diff1 \|	diff2 \|	blob \| history
config/locales/ja.yml	diff1 \|	diff2 \|	blob \| history
config/locales/ko.yml	diff1 \|	diff2 \|	blob \| history
config/locales/nl.yml	diff1 \|	diff2 \|	blob \| history
config/locales/pl.yml	diff1 \|	diff2 \|	blob \| history
config/locales/pt-BR.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.ja.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.pl.yml	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
spec/controllers/api/v1/accounts/credentials_controller_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/controllers/api/v1/mutes_controller_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/account_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/concerns/account_interactions_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/services/notify_service_spec.rb	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

RSS Atom

This page took 0.288193 seconds and 4 git commands to generate.

.env.production.sample	diff1 \|	diff2 \|	blob \| history
Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/statuses_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/stream_entries_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/core/admin.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/ja.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/pl.json	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/feed_manager.rb	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/concerns/account_interactions.rb	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/models/mute.rb	diff1 \|	diff2 \|	blob \| history
app/models/status.rb	diff1 \|	diff2 \|	blob \| history
app/models/stream_entry.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/policies/status_policy.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/reports/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/home/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/stream_entries/_simple_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/application.rb	diff1 \|	diff2 \|	blob \| history
config/environments/production.rb	diff1 \|	diff2 \|	blob \| history
config/locales/ca.yml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/es.yml	diff1 \|	diff2 \|	blob \| history
config/locales/fr.yml	diff1 \|	diff2 \|	blob \| history
config/locales/ja.yml	diff1 \|	diff2 \|	blob \| history
config/locales/ko.yml	diff1 \|	diff2 \|	blob \| history
config/locales/nl.yml	diff1 \|	diff2 \|	blob \| history
config/locales/pl.yml	diff1 \|	diff2 \|	blob \| history
config/locales/pt-BR.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.ja.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.pl.yml	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
spec/controllers/api/v1/accounts/credentials_controller_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/controllers/api/v1/mutes_controller_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/account_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/concerns/account_interactions_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/services/notify_service_spec.rb	diff1 \|	diff2 \|	blob \| history