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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c9.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.
This commit is contained in:
Thibaut Girka
2019-02-26 17:04:44 +01:00
parent d82de360c1 a5e7ada62f
commit 0158937fc2
131 changed files with 4297 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@@ -245,7 +245,7 @@ class User < ApplicationRecord
end
def shows_application?
@shows_application ||= settings.shows_application
@shows_application ||= settings.show_application
end
def token_for_app(a)