Skip to content
Permalink
Browse files

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

Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
  • Loading branch information
ThibG committed Jan 12, 2020
2 parents 180f138 + 24cd212 commit 980c004f0601bbfaf440c0ea56de408ccfd79007
Showing with 15,708 additions and 4,528 deletions.
  1. +53 −5 .circleci/config.yml
  2. +7 −5 Gemfile
  3. +28 −22 Gemfile.lock
  4. +1 −1 app/helpers/accounts_helper.rb
  5. +2 −2 app/helpers/routing_helper.rb
  6. +25 −10 app/javascript/mastodon/features/audio/index.js
  7. +35 −15 app/javascript/mastodon/features/video/index.js
  8. +21 −6 app/javascript/mastodon/locales/ar.json
  9. +91 −76 app/javascript/mastodon/locales/ast.json
  10. +15 −0 app/javascript/mastodon/locales/bg.json
  11. +42 −27 app/javascript/mastodon/locales/bn.json
  12. +40 −25 app/javascript/mastodon/locales/br.json
  13. +56 −41 app/javascript/mastodon/locales/ca.json
  14. +15 −0 app/javascript/mastodon/locales/co.json
  15. +122 −107 app/javascript/mastodon/locales/cs.json
  16. +15 −0 app/javascript/mastodon/locales/cy.json
  17. +15 −0 app/javascript/mastodon/locales/da.json
  18. +17 −2 app/javascript/mastodon/locales/de.json
  19. +12 −0 app/javascript/mastodon/locales/defaultMessages.json
  20. +16 −1 app/javascript/mastodon/locales/el.json
  21. +3 −0 app/javascript/mastodon/locales/en.json
  22. +16 −1 app/javascript/mastodon/locales/eo.json
  23. +16 −1 app/javascript/mastodon/locales/es-AR.json
  24. +73 −58 app/javascript/mastodon/locales/es.json
  25. +15 −0 app/javascript/mastodon/locales/et.json
  26. +20 −5 app/javascript/mastodon/locales/eu.json
  27. +287 −272 app/javascript/mastodon/locales/fa.json
  28. +15 −0 app/javascript/mastodon/locales/fi.json
  29. +20 −5 app/javascript/mastodon/locales/fr.json
  30. +15 −0 app/javascript/mastodon/locales/ga.json
  31. +296 −281 app/javascript/mastodon/locales/gl.json
  32. +15 −0 app/javascript/mastodon/locales/he.json
  33. +15 −0 app/javascript/mastodon/locales/hi.json
  34. +15 −0 app/javascript/mastodon/locales/hr.json
  35. +15 −0 app/javascript/mastodon/locales/hu.json
  36. +141 −126 app/javascript/mastodon/locales/hy.json
  37. +18 −3 app/javascript/mastodon/locales/id.json
  38. +15 −0 app/javascript/mastodon/locales/io.json
  39. +438 −0 app/javascript/mastodon/locales/is.json
  40. +16 −1 app/javascript/mastodon/locales/it.json
  41. +17 −2 app/javascript/mastodon/locales/ja.json
  42. +16 −1 app/javascript/mastodon/locales/ka.json
  43. +438 −0 app/javascript/mastodon/locales/kab.json
  44. +15 −0 app/javascript/mastodon/locales/kk.json
  45. +15 −0 app/javascript/mastodon/locales/kn.json
  46. +22 −7 app/javascript/mastodon/locales/ko.json
  47. +15 −0 app/javascript/mastodon/locales/lt.json
  48. +15 −0 app/javascript/mastodon/locales/lv.json
  49. +15 −0 app/javascript/mastodon/locales/mk.json
  50. +150 −135 app/javascript/mastodon/locales/ml.json
  51. +15 −0 app/javascript/mastodon/locales/mr.json
  52. +15 −0 app/javascript/mastodon/locales/ms.json
  53. +17 −2 app/javascript/mastodon/locales/nl.json
  54. +313 −298 app/javascript/mastodon/locales/nn.json
  55. +170 −155 app/javascript/mastodon/locales/no.json
  56. +16 −1 app/javascript/mastodon/locales/oc.json
  57. +15 −0 app/javascript/mastodon/locales/pl.json
  58. +210 −195 app/javascript/mastodon/locales/pt-BR.json
  59. +17 −2 app/javascript/mastodon/locales/pt-PT.json
  60. +15 −0 app/javascript/mastodon/locales/ro.json
  61. +106 −91 app/javascript/mastodon/locales/ru.json
  62. +24 −9 app/javascript/mastodon/locales/sk.json
  63. +15 −0 app/javascript/mastodon/locales/sl.json
  64. +15 −0 app/javascript/mastodon/locales/sq.json
  65. +15 −0 app/javascript/mastodon/locales/sr-Latn.json
  66. +15 −0 app/javascript/mastodon/locales/sr.json
  67. +26 −11 app/javascript/mastodon/locales/sv.json
  68. +42 −27 app/javascript/mastodon/locales/ta.json
  69. +15 −0 app/javascript/mastodon/locales/te.json
  70. +39 −24 app/javascript/mastodon/locales/th.json
  71. +18 −3 app/javascript/mastodon/locales/tr.json
  72. +15 −0 app/javascript/mastodon/locales/uk.json
  73. +144 −129 app/javascript/mastodon/locales/ur.json
  74. +438 −0 app/javascript/mastodon/locales/vi.json
  75. +2 −0 app/javascript/mastodon/locales/whitelist_is.json
  76. +2 −0 app/javascript/mastodon/locales/whitelist_kab.json
  77. +2 −0 app/javascript/mastodon/locales/whitelist_vi.json
  78. +19 −4 app/javascript/mastodon/locales/zh-CN.json
  79. +160 −145 app/javascript/mastodon/locales/zh-HK.json
  80. +23 −8 app/javascript/mastodon/locales/zh-TW.json
  81. +1 −2 app/javascript/styles/mastodon/_mixins.scss
  82. +1 −2 app/javascript/styles/mastodon/about.scss
  83. +0 −1 app/javascript/styles/mastodon/accounts.scss
  84. +15 −10 app/javascript/styles/mastodon/admin.scss
  85. +9 −18 app/javascript/styles/mastodon/components.scss
  86. +0 −1 app/javascript/styles/mastodon/footer.scss
  87. +0 −2 app/javascript/styles/mastodon/forms.scss
  88. +2 −5 app/javascript/styles/mastodon/widgets.scss
  89. +1 −1 app/lib/activitypub/activity.rb
  90. +3 −2 app/lib/formatter.rb
  91. +4 −2 app/lib/request.rb
  92. +1 −1 app/lib/sanitize_config.rb
  93. +0 −4 app/models/account.rb
  94. +2 −10 app/models/concerns/status_threading_concern.rb
  95. +1 −1 app/models/domain_block.rb
  96. +6 −1 app/models/status.rb
  97. +1 −1 app/services/activitypub/process_collection_service.rb
  98. +1 −1 app/services/fetch_resource_service.rb
  99. +1 −1 app/services/vote_service.rb
  100. +8 −0 app/validators/vote_validator.rb
  101. +3 −3 app/views/admin/custom_emojis/index.html.haml
  102. +14 −9 app/views/admin/email_domain_blocks/index.html.haml
  103. +1 −1 app/views/admin/reports/show.html.haml
  104. +2 −3 app/views/filters/index.html.haml
  105. +2 −2 app/views/layouts/admin.html.haml
  106. +19 −14 app/views/settings/applications/index.html.haml
  107. +7 −3 app/workers/activitypub/delivery_worker.rb
  108. +50 −1 config/initializers/twitter_regex.rb
  109. +3 −0 config/locales/activerecord.ast.yml
  110. +1 −1 config/locales/activerecord.ca.yml
  111. +17 −0 config/locales/activerecord.is.yml
  112. +12 −0 config/locales/activerecord.kab.yml
  113. +11 −0 config/locales/activerecord.ml.yml
  114. +16 −0 config/locales/activerecord.nn.yml
  115. +4 −0 config/locales/activerecord.no.yml
  116. +2 −2 config/locales/activerecord.pt-BR.yml
  117. +4 −0 config/locales/activerecord.pt-PT.yml
  118. +3 −3 config/locales/activerecord.ta.yml
  119. +17 −0 config/locales/activerecord.vi.yml
  120. +44 −4 config/locales/ar.yml
  121. +181 −23 config/locales/ast.yml
  122. +0 −1 config/locales/bg.yml
  123. +5 −0 config/locales/br.yml
  124. +86 −64 config/locales/ca.yml
  125. +27 −5 config/locales/co.yml
  126. +296 −270 config/locales/cs.yml
  127. +32 −1 config/locales/cy.yml
  128. +66 −1 config/locales/da.yml
  129. +25 −1 config/locales/de.yml
  130. +3 −0 config/locales/devise.ar.yml
  131. +29 −2 config/locales/devise.ast.yml
  132. +13 −13 config/locales/devise.ca.yml
  133. +37 −37 config/locales/devise.cs.yml
  134. +10 −2 config/locales/devise.da.yml
  135. +2 −2 config/locales/devise.de.yml
  136. +10 −10 config/locales/devise.es.yml
  137. +72 −72 config/locales/devise.gl.yml
  138. +98 −0 config/locales/devise.is.yml
  139. +58 −0 config/locales/devise.kab.yml
  140. +4 −0 config/locales/devise.kn.yml
  141. +24 −0 config/locales/devise.ml.yml
  142. +93 −0 config/locales/devise.nn.yml
  143. +4 −0 config/locales/devise.no.yml
  144. +15 −0 config/locales/devise.pt-PT.yml
  145. +22 −22 config/locales/devise.ru.yml
  146. +2 −0 config/locales/devise.sk.yml
  147. +16 −2 config/locales/devise.sv.yml
  148. +13 −1 config/locales/devise.ta.yml
  149. +34 −9 config/locales/devise.th.yml
  150. +1 −0 config/locales/devise.uk.yml
  151. +4 −0 config/locales/devise.ur.yml
  152. +97 −0 config/locales/devise.vi.yml
  153. +5 −5 config/locales/devise.zh-CN.yml
  154. +10 −10 config/locales/devise.zh-TW.yml
  155. +3 −0 config/locales/doorkeeper.ar.yml
  156. +30 −2 config/locales/doorkeeper.ast.yml
  157. +8 −5 config/locales/doorkeeper.ca.yml
  158. +3 −0 config/locales/doorkeeper.co.yml
  159. +23 −20 config/locales/doorkeeper.cs.yml
  160. +2 −0 config/locales/doorkeeper.cy.yml
  161. +3 −1 config/locales/doorkeeper.da.yml
  162. +3 −0 config/locales/doorkeeper.de.yml
  163. +3 −0 config/locales/doorkeeper.el.yml
  164. +4 −1 config/locales/doorkeeper.eo.yml
  165. +3 −0 config/locales/doorkeeper.es-AR.yml
  166. +4 −1 config/locales/doorkeeper.es.yml
  167. +3 −0 config/locales/doorkeeper.et.yml
  168. +3 −0 config/locales/doorkeeper.eu.yml
  169. +47 −2 config/locales/doorkeeper.fa.yml
  170. +17 −15 config/locales/doorkeeper.fr.yml
  171. +3 −0 config/locales/doorkeeper.gl.yml
  172. +2 −0 config/locales/doorkeeper.hu.yml
  173. +3 −0 config/locales/doorkeeper.id.yml
  174. +140 −0 config/locales/doorkeeper.is.yml
  175. +3 −0 config/locales/doorkeeper.it.yml
  176. +3 −0 config/locales/doorkeeper.ja.yml
  177. +104 −0 config/locales/doorkeeper.kab.yml
  178. +3 −0 config/locales/doorkeeper.kk.yml
  179. +3 −0 config/locales/doorkeeper.ko.yml
  180. +28 −0 config/locales/doorkeeper.ml.yml
  181. +16 −14 config/locales/doorkeeper.nl.yml
  182. +149 −0 config/locales/doorkeeper.nn.yml
  183. +32 −0 config/locales/doorkeeper.no.yml
  184. +2 −0 config/locales/doorkeeper.oc.yml
  185. +45 −36 config/locales/doorkeeper.pt-BR.yml
  186. +33 −0 config/locales/doorkeeper.pt-PT.yml
  187. +16 −13 config/locales/doorkeeper.ru.yml
  188. +2 −0 config/locales/doorkeeper.sk.yml
  189. +6 −5 config/locales/doorkeeper.sv.yml
  190. +1 −0 config/locales/doorkeeper.ta.yml
  191. +8 −1 config/locales/doorkeeper.th.yml
  192. +3 −0 config/locales/doorkeeper.tr.yml
  193. +150 −0 config/locales/doorkeeper.vi.yml
  194. +9 −7 config/locales/doorkeeper.zh-CN.yml
  195. +31 −0 config/locales/doorkeeper.zh-HK.yml
  196. +2 −0 config/locales/doorkeeper.zh-TW.yml
  197. +36 −15 config/locales/el.yml
  198. +2 −0 config/locales/en.yml
  199. +3 −0 config/locales/en_GB.yml
  200. +55 −13 config/locales/eo.yml
  201. +29 −1 config/locales/es-AR.yml
  202. +107 −84 config/locales/es.yml
  203. +28 −6 config/locales/et.yml
  204. +24 −2 config/locales/eu.yml
  205. +63 −37 config/locales/fa.yml
  206. +2 −1 config/locales/fi.yml
  207. +29 −7 config/locales/fr.yml
  208. +268 −243 config/locales/gl.yml
  209. +0 −1 config/locales/he.yml
  210. +0 −1 config/locales/hr.yml
  211. +23 −2 config/locales/hu.yml
  212. +15 −0 config/locales/hy.yml
  213. +82 −1 config/locales/id.yml
  214. +0 −1 config/locales/io.yml
  215. +1,151 −0 config/locales/is.yml
  216. +31 −2 config/locales/it.yml
  217. +21 −1 config/locales/ja.yml
  218. +0 −1 config/locales/ka.yml
  219. +433 −0 config/locales/kab.yml
  220. +12 −1 config/locales/kk.yml
  221. +40 −17 config/locales/ko.yml
  222. +0 −1 config/locales/lt.yml
  223. +42 −0 config/locales/ml.yml
  224. +19 −1 config/locales/nl.yml
  225. +1,155 −14 config/locales/nn.yml
  226. +585 −10 config/locales/no.yml
  227. +15 −1 config/locales/oc.yml
  228. +7 −2 config/locales/pl.yml
  229. +506 −372 config/locales/pt-BR.yml
  230. +300 −12 config/locales/pt-PT.yml
  231. +0 −1 config/locales/ro.yml
  232. +185 −153 config/locales/ru.yml
  233. +8 −0 config/locales/simple_form.ar.yml
  234. +50 −16 config/locales/simple_form.ast.yml
  235. +10 −10 config/locales/simple_form.ca.yml
  236. +37 −37 config/locales/simple_form.cs.yml
  237. +17 −3 config/locales/simple_form.da.yml
  238. +1 −1 config/locales/simple_form.de.yml
  239. +14 −14 config/locales/simple_form.el.yml
  240. +8 −8 config/locales/simple_form.en.yml
  241. +4 −1 config/locales/simple_form.eo.yml
  242. +20 −20 config/locales/simple_form.es.yml
  243. +4 −4 config/locales/simple_form.fr.yml
  244. +11 −11 config/locales/simple_form.gl.yml
  245. +3 −0 config/locales/simple_form.id.yml
  246. +134 −0 config/locales/simple_form.is.yml
  247. +8 −8 config/locales/simple_form.ja.yml
  248. +62 −0 config/locales/simple_form.kab.yml
  249. +8 −0 config/locales/simple_form.ml.yml
  250. +8 −8 config/locales/simple_form.nl.yml
  251. +144 −0 config/locales/simple_form.nn.yml
  252. +81 −1 config/locales/simple_form.no.yml
  253. +79 −75 config/locales/simple_form.pt-BR.yml
  254. +38 −0 config/locales/simple_form.pt-PT.yml
  255. +50 −50 config/locales/simple_form.ru.yml
  256. +3 −0 config/locales/simple_form.sk.yml
  257. +10 −6 config/locales/simple_form.sv.yml
  258. +31 −10 config/locales/simple_form.th.yml
  259. +171 −0 config/locales/simple_form.vi.yml
  260. +29 −7 config/locales/simple_form.zh-CN.yml
  261. +56 −0 config/locales/simple_form.zh-HK.yml
  262. +1 −0 config/locales/simple_form.zh-TW.yml
  263. +27 −6 config/locales/sk.yml
  264. +0 −1 config/locales/sl.yml
  265. +0 −1 config/locales/sq.yml
  266. +0 −1 config/locales/sr-Latn.yml
  267. +0 −1 config/locales/sr.yml
  268. +124 −15 config/locales/sv.yml
  269. +173 −0 config/locales/ta.yml
  270. +130 −19 config/locales/th.yml
  271. +26 −3 config/locales/tr.yml
  272. +50 −1 config/locales/uk.yml
  273. +1,113 −0 config/locales/vi.yml
  274. +89 −25 config/locales/zh-CN.yml
  275. +132 −1 config/locales/zh-HK.yml
  276. +31 −1 config/locales/zh-TW.yml
  277. +4 −2 db/migrate/20180206000000_change_user_id_nonnullable.rb
  278. +3 −1 db/migrate/20191031163205_change_list_account_follow_nullable.rb
  279. +8 −1 lib/mastodon/emoji_cli.rb
  280. +1 −1 lib/paperclip/blurhash_transcoder.rb
  281. +2 −2 package.json
  282. +16 −0 spec/lib/formatter_spec.rb
  283. +0 −7 spec/models/account_spec.rb
  284. +10 −0 spec/models/domain_block_spec.rb
  285. +8 −4 spec/models/status_spec.rb
  286. +6 −6 yarn.lock
@@ -3,7 +3,7 @@ version: 2
aliases:
- &defaults
docker:
- image: circleci/ruby:2.6-buster-node
- image: circleci/ruby:2.7-buster-node
environment: &ruby_environment
BUNDLE_APP_CONFIG: ./.bundle/
DB_HOST: localhost
@@ -98,8 +98,15 @@ jobs:
<<: *defaults
<<: *install_steps

install-ruby2.7:
<<: *defaults
<<: *install_ruby_dependencies

install-ruby2.6:
<<: *defaults
docker:
- image: circleci/ruby:2.6-buster-node
environment: *ruby_environment
<<: *install_ruby_dependencies

install-ruby2.5:
@@ -128,6 +135,36 @@ jobs:
- ./mastodon/public/assets
- ./mastodon/public/packs-test/

test-migrations:
<<: *defaults
docker:
- image: circleci/ruby:2.7-buster-node
environment: *ruby_environment
- image: circleci/postgres:10.6-alpine
environment:
POSTGRES_USER: root
- image: circleci/redis:5-alpine
steps:
- *attach_workspace
- *install_system_dependencies
- run:
name: Create database
command: ./bin/rails parallel:create
- run:
name: Run migrations
command: ./bin/rails parallel:migrate

test-ruby2.7:
<<: *defaults
docker:
- image: circleci/ruby:2.7-buster-node
environment: *ruby_environment
- image: circleci/postgres:10.6-alpine
environment:
POSTGRES_USER: root
- image: circleci/redis:5-alpine
<<: *test_steps

test-ruby2.6:
<<: *defaults
docker:
@@ -184,20 +221,31 @@ workflows:
build-and-test:
jobs:
- install
- install-ruby2.7:
requires:
- install
- install-ruby2.6:
requires:
- install
- install-ruby2.7
- install-ruby2.5:
requires:
- install
- install-ruby2.6
- install-ruby2.7
- install-ruby2.4:
requires:
- install
- install-ruby2.6
- install-ruby2.7
- build:
requires:
- install-ruby2.6
- install-ruby2.7
- test-migrations:
requires:
- install-ruby2.7
- test-ruby2.7:
requires:
- install-ruby2.7
- build
- test-ruby2.6:
requires:
- install-ruby2.6
@@ -215,4 +263,4 @@ workflows:
- install
- check-i18n:
requires:
- install-ruby2.6
- install-ruby2.7
12 Gemfile
@@ -1,7 +1,7 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby '>= 2.4.0', '< 2.7.0'
ruby '>= 2.4.0', '< 3.0.0'

gem 'pkg-config', '~> 1.4'

@@ -10,6 +10,9 @@ gem 'rails', '~> 5.2.4'
gem 'sprockets', '~> 3.7.2'
gem 'thor', '~> 0.20'

gem 'thwait', '~> 0.1.0'
gem 'e2mmap', '~> 0.1.0'

gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.2'
gem 'makara', '~> 0.4'
@@ -54,7 +57,7 @@ gem 'redis-namespace', '~> 1.7'
gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
gem 'html2text'
gem 'htmlentities', '~> 4.3'
gem 'http', '~> 3.3'
gem 'http', '~> 4.3'
gem 'http_accept_language', '~> 2.1'
gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true
gem 'httplog', '~> 1.3'
@@ -66,7 +69,6 @@ gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b
gem 'nokogiri', '~> 1.10'
gem 'nsa', '~> 0.2'
gem 'oj', '~> 3.10'
gem 'ostatus2', '~> 2.0'
gem 'ox', '~> 2.11'
gem 'parslet'
gem 'parallel', '~> 1.19'
@@ -79,7 +81,7 @@ gem 'rails-i18n', '~> 5.1'
gem 'rails-settings-cached', '~> 0.6'
gem 'redis', '~> 4.1', require: ['redis', 'redis/connection/hiredis']
gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
gem 'rqrcode', '~> 0.10'
gem 'rqrcode', '~> 1.1'
gem 'ruby-progressbar', '~> 1.10'
gem 'sanitize', '~> 5.1'
gem 'sidekiq', '~> 5.2'
@@ -100,7 +102,7 @@ gem 'webpush'

gem 'json-ld', git: 'https://github.com/ruby-rdf/json-ld.git', ref: 'e742697a0906e74e8bb777ef98137bc3955d981d'
gem 'json-ld-preloaded', '~> 3.0'
gem 'rdf-normalize', '~> 0.3'
gem 'rdf-normalize', '~> 0.4'

gem 'redcarpet', '~> 3.4'

@@ -128,7 +128,7 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
blurhash (0.1.3)
blurhash (0.1.4)
ffi (~> 1.10.0)
bootsnap (1.4.5)
msgpack (~> 1.0)
@@ -173,7 +173,7 @@ GEM
activesupport (>= 4.0)
elasticsearch (>= 2.0.0)
elasticsearch-dsl
chunky_png (1.3.10)
chunky_png (1.3.11)
cld3 (3.2.6)
ffi (>= 1.1.0, < 1.12.0)
climate_control (0.2.0)
@@ -216,14 +216,15 @@ GEM
discard (1.1.0)
activerecord (>= 4.2, < 7)
docile (1.3.2)
domain_name (0.5.20180417)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.2.3)
railties (>= 5)
dotenv (2.7.5)
dotenv-rails (2.7.5)
dotenv (= 2.7.5)
railties (>= 3.2, < 6.1)
e2mmap (0.1.0)
elasticsearch (7.3.0)
elasticsearch-api (= 7.3.0)
elasticsearch-transport (= 7.3.0)
@@ -247,6 +248,9 @@ GEM
fast_blank (1.0.0)
fastimage (2.1.7)
ffi (1.10.0)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fog-core (2.1.0)
builder
excon (~> 0.58)
@@ -270,9 +274,9 @@ GEM
ffi (~> 1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
goldfinger (2.1.0)
goldfinger (2.1.1)
addressable (~> 2.5)
http (~> 3.0)
http (~> 4.0)
nokogiri (~> 1.8)
oj (~> 3.0)
hamlit (2.11.0)
@@ -295,14 +299,16 @@ GEM
html2text (0.2.1)
nokogiri (~> 1.6)
htmlentities (4.3.4)
http (3.3.0)
http (4.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-form_data (~> 2.2)
http-parser (~> 1.2.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (2.1.1)
http-form_data (2.2.0)
http-parser (1.2.1)
ffi-compiler (>= 1.0, < 2.0)
http_accept_language (2.1.1)
httplog (1.3.3)
rack (>= 1.0)
@@ -324,7 +330,7 @@ GEM
iso-639 (0.2.8)
jaro_winkler (1.5.4)
jmespath (1.4.0)
json (2.2.0)
json (2.3.0)
json-canonicalization (0.1.0)
json-ld-preloaded (3.0.6)
json-ld (~> 3.0)
@@ -411,10 +417,6 @@ GEM
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
orm_adapter (0.5.0)
ostatus2 (2.0.3)
addressable (~> 2.5)
http (~> 3.0)
nokogiri (~> 1.8)
ox (2.11.0)
paperclip (6.0.0)
activemodel (>= 4.2.0)
@@ -506,11 +508,11 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
rdf (3.0.13)
rdf (3.1.0)
hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
rdf-normalize (0.3.3)
rdf (>= 2.2, < 4.0)
rdf-normalize (0.4.0)
rdf (~> 3.1)
redcarpet (3.4.0)
redis (4.1.3)
redis-actionpack (5.0.2)
@@ -539,8 +541,10 @@ GEM
railties (>= 5.0)
rotp (2.1.2)
rpam2 (4.0.2)
rqrcode (0.10.1)
rqrcode (1.1.2)
chunky_png (~> 1.0)
rqrcode_core (~> 0.1)
rqrcode_core (0.1.1)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-expectations (3.9.0)
@@ -632,6 +636,7 @@ GEM
climate_control (>= 0.0.3, < 1.0)
thor (0.20.3)
thread_safe (0.3.6)
thwait (0.1.0)
tilt (2.0.10)
tty-color (0.5.0)
tty-command (0.9.0)
@@ -712,6 +717,7 @@ DEPENDENCIES
discard (~> 1.1)
doorkeeper (~> 5.2)
dotenv-rails (~> 2.7)
e2mmap (~> 0.1.0)
fabrication (~> 2.21)
faker (~> 2.10)
fast_blank (~> 1.0)
@@ -725,7 +731,7 @@ DEPENDENCIES
hiredis (~> 0.6)
html2text
htmlentities (~> 4.3)
http (~> 3.3)
http (~> 4.3)
http_accept_language (~> 2.1)
http_parser.rb (~> 0.6)!
httplog (~> 1.3)
@@ -752,7 +758,6 @@ DEPENDENCIES
omniauth (~> 1.9)
omniauth-cas (~> 1.1)
omniauth-saml (~> 1.10)
ostatus2 (~> 2.0)
ox (~> 2.11)
paperclip (~> 6.0)
paperclip-av-transcoder (~> 0.6)
@@ -775,12 +780,12 @@ DEPENDENCIES
rails-controller-testing (~> 1.0)
rails-i18n (~> 5.1)
rails-settings-cached (~> 0.6)
rdf-normalize (~> 0.3)
rdf-normalize (~> 0.4)
redcarpet (~> 3.4)
redis (~> 4.1)
redis-namespace (~> 1.7)
redis-rails (~> 5.0)
rqrcode (~> 0.10)
rqrcode (~> 1.1)
rspec-rails (~> 3.9)
rspec-sidekiq (~> 3.0)
rubocop (~> 0.78)
@@ -801,6 +806,7 @@ DEPENDENCIES
streamio-ffmpeg (~> 3.0)
strong_migrations (~> 0.5)
thor (~> 0.20)
thwait (~> 0.1.0)
tty-command (~> 0.9)
tty-prompt (~> 0.20)
twitter-text (~> 1.14)
@@ -3,7 +3,7 @@
module AccountsHelper
def display_name(account, **options)
if options[:custom_emojify]
Formatter.instance.format_display_name(account, options)
Formatter.instance.format_display_name(account, **options)
else
account.display_name.presence || account.username
end
@@ -13,13 +13,13 @@ def default_url_options
end

def full_asset_url(source, **options)
source = ActionController::Base.helpers.asset_url(source, options) unless use_storage?
source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?

URI.join(root_url, source).to_s
end

def full_pack_url(source, **options)
full_asset_url(asset_pack_path(source, options))
full_asset_url(asset_pack_path(source, **options))
end

private

0 comments on commit 980c004

Please sign in to comment.
You can’t perform that action at this time.