rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app
History
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
 		2019-12-19 13:52:54 +01:00
..
chewy Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041) 2019-10-02 20:04:46 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
javascript Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
lib Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
mailers Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
models Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-11-30 17:29:44 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
services Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
validators Increase poll option length limit to 100 chars, number of options to 5 2019-10-10 20:13:59 +02:00
views Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-11-07 13:43:56 +01:00