]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 30 Aug 2019 11:38:41 +0000 (13:38 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 30 Aug 2019 11:38:41 +0000 (13:38 +0200)
commit9044a2b051da18e9f70fd4fae55c2bd232891d1f
tree0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4
parent2848c08953a8555e06791170dbf1090575e05d8a
parent49f57b55346f8e62d21a3c8bc63301038ecb796f
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
17 files changed:
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/directories_controller.rb
app/controllers/remote_follow_controller.rb
app/controllers/remote_interaction_controller.rb
app/helpers/statuses_helper.rb
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/media_attachment.rb
app/serializers/rest/account_serializer.rb
app/views/directories/index.html.haml
app/views/settings/profiles/show.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
config/routes.rb
package.json