Showing with 11,472 additions and 3,978 deletions.
  1. +7 −0 .browserslistrc
  2. +2 −1 .devcontainer/devcontainer.json
  3. +47 −0 CHANGELOG.md
  4. +8 −8 Gemfile
  5. +81 −86 Gemfile.lock
  6. +1 −1 SECURITY.md
  7. +4 −4 app/chewy/accounts_index.rb
  8. +3 −1 app/chewy/statuses_index.rb
  9. +7 −3 app/chewy/tags_index.rb
  10. +0 −1 app/controllers/accounts_controller.rb
  11. +1 −0 app/controllers/activitypub/base_controller.rb
  12. +5 −0 app/controllers/api/base_controller.rb
  13. +10 −0 app/controllers/api/v1/accounts_controller.rb
  14. +1 −1 app/controllers/auth/confirmations_controller.rb
  15. +5 −12 app/controllers/media_proxy_controller.rb
  16. +4 −11 app/controllers/settings/exports_controller.rb
  17. +0 −1 app/controllers/tags_controller.rb
  18. +3 −3 app/helpers/application_helper.rb
  19. +26 −0 app/helpers/formatting_helper.rb
  20. +4 −0 app/helpers/languages_helper.rb
  21. +1 −1 app/helpers/statuses_helper.rb
  22. +7 −0 app/javascript/mastodon/actions/accounts.js
  23. +11 −5 app/javascript/mastodon/actions/compose.js
  24. +12 −0 app/javascript/mastodon/actions/languages.js
  25. +2 −1 app/javascript/mastodon/actions/notifications.js
  26. +8 −1 app/javascript/mastodon/components/account.js
  27. +13 −15 app/javascript/mastodon/components/avatar.js
  28. +1 −1 app/javascript/mastodon/components/status.js
  29. +31 −26 app/javascript/mastodon/features/account/components/header.js
  30. +5 −3 app/javascript/mastodon/features/account_timeline/components/header.js
  31. +35 −0 app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
  32. +2 −1 app/javascript/mastodon/features/account_timeline/containers/header_container.js
  33. +12 −4 app/javascript/mastodon/features/account_timeline/index.js
  34. +1 −1 app/javascript/mastodon/features/blocks/index.js
  35. +11 −2 app/javascript/mastodon/features/compose/components/compose_form.js
  36. +332 −0 app/javascript/mastodon/features/compose/components/language_dropdown.js
  37. +1 −6 app/javascript/mastodon/features/compose/components/text_icon_button.js
  38. +34 −0 app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
  39. +16 −4 app/javascript/mastodon/features/followers/index.js
  40. +16 −4 app/javascript/mastodon/features/following/index.js
  41. +1 −1 app/javascript/mastodon/features/mutes/index.js
  42. +1 −1 app/javascript/mastodon/features/status/components/detailed_status.js
  43. +1 −1 app/javascript/mastodon/features/ui/components/boost_modal.js
  44. +1 −1 app/javascript/mastodon/features/ui/components/columns_area.js
  45. +1 −0 app/javascript/mastodon/initial_state.js
  46. +50 −44 app/javascript/mastodon/locales/af.json
  47. +32 −26 app/javascript/mastodon/locales/ar.json
  48. +9 −3 app/javascript/mastodon/locales/ast.json
  49. +9 −3 app/javascript/mastodon/locales/bg.json
  50. +9 −3 app/javascript/mastodon/locales/bn.json
  51. +9 −3 app/javascript/mastodon/locales/br.json
  52. +45 −39 app/javascript/mastodon/locales/ca.json
  53. +101 −95 app/javascript/mastodon/locales/ckb.json
  54. +9 −3 app/javascript/mastodon/locales/co.json
  55. +10 −4 app/javascript/mastodon/locales/cs.json
  56. +19 −13 app/javascript/mastodon/locales/cy.json
  57. +10 −4 app/javascript/mastodon/locales/da.json
  58. +26 −20 app/javascript/mastodon/locales/de.json
  59. +65 −11 app/javascript/mastodon/locales/defaultMessages.json
  60. +10 −4 app/javascript/mastodon/locales/el.json
  61. +549 −0 app/javascript/mastodon/locales/en-GB.json
  62. +10 −4 app/javascript/mastodon/locales/en.json
  63. +15 −9 app/javascript/mastodon/locales/eo.json
  64. +11 −5 app/javascript/mastodon/locales/es-AR.json
  65. +14 −8 app/javascript/mastodon/locales/es-MX.json
  66. +11 −5 app/javascript/mastodon/locales/es.json
  67. +51 −45 app/javascript/mastodon/locales/et.json
  68. +9 −3 app/javascript/mastodon/locales/eu.json
  69. +16 −10 app/javascript/mastodon/locales/fa.json
  70. +9 −3 app/javascript/mastodon/locales/fi.json
  71. +23 −17 app/javascript/mastodon/locales/fr.json
  72. +9 −3 app/javascript/mastodon/locales/ga.json
  73. +15 −9 app/javascript/mastodon/locales/gd.json
  74. +19 −13 app/javascript/mastodon/locales/gl.json
  75. +272 −266 app/javascript/mastodon/locales/he.json
  76. +27 −21 app/javascript/mastodon/locales/hi.json
  77. +10 −4 app/javascript/mastodon/locales/hr.json
  78. +19 −13 app/javascript/mastodon/locales/hu.json
  79. +11 −5 app/javascript/mastodon/locales/hy.json
  80. +10 −4 app/javascript/mastodon/locales/id.json
  81. +327 −321 app/javascript/mastodon/locales/io.json
  82. +10 −4 app/javascript/mastodon/locales/is.json
  83. +10 −4 app/javascript/mastodon/locales/it.json
  84. +11 −5 app/javascript/mastodon/locales/ja.json
  85. +9 −3 app/javascript/mastodon/locales/ka.json
  86. +9 −3 app/javascript/mastodon/locales/kab.json
  87. +9 −3 app/javascript/mastodon/locales/kk.json
  88. +9 −3 app/javascript/mastodon/locales/kn.json
  89. +20 −14 app/javascript/mastodon/locales/ko.json
  90. +10 −4 app/javascript/mastodon/locales/ku.json
  91. +9 −3 app/javascript/mastodon/locales/kw.json
  92. +9 −3 app/javascript/mastodon/locales/lt.json
  93. +10 −4 app/javascript/mastodon/locales/lv.json
  94. +9 −3 app/javascript/mastodon/locales/mk.json
  95. +9 −3 app/javascript/mastodon/locales/ml.json
  96. +9 −3 app/javascript/mastodon/locales/mr.json
  97. +9 −3 app/javascript/mastodon/locales/ms.json
  98. +10 −4 app/javascript/mastodon/locales/nl.json
  99. +9 −3 app/javascript/mastodon/locales/nn.json
  100. +9 −3 app/javascript/mastodon/locales/no.json
  101. +9 −3 app/javascript/mastodon/locales/oc.json
  102. +9 −3 app/javascript/mastodon/locales/pa.json
  103. +10 −4 app/javascript/mastodon/locales/pl.json
  104. +20 −14 app/javascript/mastodon/locales/pt-BR.json
  105. +10 −4 app/javascript/mastodon/locales/pt-PT.json
  106. +9 −3 app/javascript/mastodon/locales/ro.json
  107. +11 −5 app/javascript/mastodon/locales/ru.json
  108. +9 −3 app/javascript/mastodon/locales/sa.json
  109. +9 −3 app/javascript/mastodon/locales/sc.json
  110. +9 −3 app/javascript/mastodon/locales/si.json
  111. +12 −6 app/javascript/mastodon/locales/sk.json
  112. +51 −45 app/javascript/mastodon/locales/sl.json
  113. +10 −4 app/javascript/mastodon/locales/sq.json
  114. +9 −3 app/javascript/mastodon/locales/sr-Latn.json
  115. +9 −3 app/javascript/mastodon/locales/sr.json
  116. +14 −8 app/javascript/mastodon/locales/sv.json
  117. +9 −3 app/javascript/mastodon/locales/szl.json
  118. +9 −3 app/javascript/mastodon/locales/ta.json
  119. +9 −3 app/javascript/mastodon/locales/tai.json
  120. +9 −3 app/javascript/mastodon/locales/te.json
  121. +16 −10 app/javascript/mastodon/locales/th.json
  122. +11 −5 app/javascript/mastodon/locales/tr.json
  123. +16 −10 app/javascript/mastodon/locales/tt.json
  124. +9 −3 app/javascript/mastodon/locales/ug.json
  125. +141 −135 app/javascript/mastodon/locales/uk.json
  126. +9 −3 app/javascript/mastodon/locales/ur.json
  127. +11 −5 app/javascript/mastodon/locales/vi.json
  128. +2 −0 app/javascript/mastodon/locales/whitelist_en-GB.json
  129. +9 −3 app/javascript/mastodon/locales/zgh.json
  130. +103 −97 app/javascript/mastodon/locales/zh-CN.json
  131. +9 −3 app/javascript/mastodon/locales/zh-HK.json
  132. +19 −13 app/javascript/mastodon/locales/zh-TW.json
  133. +6 −1 app/javascript/mastodon/reducers/accounts.js
  134. +8 −1 app/javascript/mastodon/reducers/compose.js
  135. +5 −0 app/javascript/mastodon/reducers/settings.js
  136. +8 −0 app/javascript/mastodon/selectors/index.js
  137. +16 −6 app/javascript/styles/mastodon-light/diff.scss
  138. +78 −1 app/javascript/styles/mastodon/components.scss
  139. +1 −16 app/lib/activitypub/activity.rb
  140. +1 −1 app/lib/activitypub/activity/announce.rb
  141. +2 −2 app/lib/activitypub/activity/create.rb
  142. +3 −3 app/lib/activitypub/activity/delete.rb
  143. +4 −0 app/lib/application_extension.rb
  144. +22 −6 app/lib/emoji_formatter.rb
  145. +30 −0 app/lib/importer/accounts_index_importer.rb
  146. +87 −0 app/lib/importer/base_importer.rb
  147. +89 −0 app/lib/importer/statuses_index_importer.rb
  148. +26 −0 app/lib/importer/tags_index_importer.rb
  149. +33 −0 app/lib/rss/builder.rb
  150. +49 −0 app/lib/rss/channel.rb
  151. +24 −0 app/lib/rss/element.rb
  152. +45 −0 app/lib/rss/item.rb
  153. +35 −0 app/lib/rss/media_content.rb
  154. +0 −55 app/lib/rss/serializer.rb
  155. +0 −130 app/lib/rss_builder.rb
  156. +7 −2 app/models/account.rb
  157. +3 −10 app/models/account_migration.rb
  158. +12 −0 app/models/account_stat.rb
  159. +6 −2 app/models/admin/account_action.rb
  160. +5 −1 app/models/admin/status_batch_action.rb
  161. +19 −0 app/models/concerns/lockable.rb
  162. +4 −4 app/models/concerns/redisable.rb
  163. +2 −3 app/models/poll.rb
  164. +1 −1 app/models/status.rb
  165. +12 −0 app/models/status_stat.rb
  166. +11 −9 app/models/trends/history.rb
  167. +2 −1 app/models/user.rb
  168. +7 −1 app/serializers/initial_state_serializer.rb
  169. +6 −1 app/serializers/rest/account_serializer.rb
  170. +1 −1 app/serializers/rest/preferences_serializer.rb
  171. +0 −28 app/serializers/rss/account_serializer.rb
  172. +0 −25 app/serializers/rss/tag_serializer.rb
  173. +1 −0 app/services/activitypub/fetch_remote_status_service.rb
  174. +13 −20 app/services/activitypub/process_account_service.rb
  175. +17 −29 app/services/activitypub/process_status_update_service.rb
  176. +2 −1 app/services/appeal_service.rb
  177. +2 −1 app/services/approve_appeal_service.rb
  178. +4 −11 app/services/fetch_link_card_service.rb
  179. +3 −0 app/services/process_mentions_service.rb
  180. +27 −34 app/services/remove_status_service.rb
  181. +1 −1 app/services/report_service.rb
  182. +3 −10 app/services/resolve_account_service.rb
  183. +5 −1 app/services/unfollow_service.rb
  184. +1 −1 app/services/verify_link_service.rb
  185. +8 −13 app/services/vote_service.rb
  186. +37 −0 app/views/accounts/show.rss.ruby
  187. +2 −2 app/views/disputes/strikes/show.html.haml
  188. +1 −1 app/views/statuses/_simple_status.html.haml
  189. +35 −0 app/views/tags/show.rss.ruby
  190. +3 −6 app/workers/distribution_worker.rb
  191. +26 −0 app/workers/scheduler/indexing_scheduler.rb
  192. +4 −1 chart/templates/configmap-env.yaml
  193. +3 −0 chart/values.yaml
  194. +1 −1 config/application.rb
  195. +2 −3 config/initializers/chewy.rb
  196. +7 −0 config/initializers/doorkeeper.rb
  197. +31 −0 config/locales/activerecord.af.yml
  198. +15 −0 config/locales/activerecord.ckb.yml
  199. +19 −0 config/locales/activerecord.he.yml
  200. +24 −0 config/locales/af.yml
  201. +36 −0 config/locales/ar.yml
  202. +2 −0 config/locales/ast.yml
  203. +34 −24 config/locales/ca.yml
  204. +174 −8 config/locales/ckb.yml
  205. +10 −0 config/locales/cs.yml
  206. +36 −8 config/locales/cy.yml
  207. +12 −1 config/locales/da.yml
  208. +21 −9 config/locales/de.yml
  209. +1 −1 config/locales/devise.ca.yml
  210. +1 −1 config/locales/devise.gl.yml
  211. +56 −2 config/locales/devise.he.yml
  212. +55 −0 config/locales/devise.io.yml
  213. +1 −1 config/locales/devise.ru.yml
  214. +1 −1 config/locales/devise.th.yml
  215. +18 −18 config/locales/devise.zh-TW.yml
  216. +1 −0 config/locales/doorkeeper.ar.yml
  217. +42 −0 config/locales/doorkeeper.ckb.yml
  218. +1 −0 config/locales/doorkeeper.en-GB.yml
  219. +8 −0 config/locales/doorkeeper.eo.yml
  220. +75 −2 config/locales/doorkeeper.he.yml
  221. +30 −30 config/locales/doorkeeper.io.yml
  222. +2 −0 config/locales/doorkeeper.pt-BR.yml
  223. +7 −4 config/locales/doorkeeper.ru.yml
  224. +3 −3 config/locales/doorkeeper.sl.yml
  225. +3 −2 config/locales/doorkeeper.th.yml
  226. +4 −2 config/locales/doorkeeper.uk.yml
  227. +1 −1 config/locales/doorkeeper.zh-CN.yml
  228. +15 −15 config/locales/doorkeeper.zh-TW.yml
  229. +6 −0 config/locales/el.yml
  230. +12 −2 config/locales/en.yml
  231. +16 −1 config/locales/eo.yml
  232. +12 −0 config/locales/es-AR.yml
  233. +9 −0 config/locales/es-MX.yml
  234. +11 −1 config/locales/es.yml
  235. +11 −7 config/locales/et.yml
  236. +1 −1 config/locales/eu.yml
  237. +30 −0 config/locales/fa.yml
  238. +9 −2 config/locales/fr.yml
  239. +12 −0 config/locales/gd.yml
  240. +13 −3 config/locales/gl.yml
  241. +1,382 −6 config/locales/he.yml
  242. +13 −3 config/locales/hu.yml
  243. +10 −0 config/locales/id.yml
  244. +1,582 −7 config/locales/io.yml
  245. +10 −0 config/locales/is.yml
  246. +20 −8 config/locales/it.yml
  247. +10 −0 config/locales/ja.yml
  248. +31 −21 config/locales/ko.yml
  249. +12 −0 config/locales/ku.yml
  250. +12 −0 config/locales/lv.yml
  251. +31 −0 config/locales/pl.yml
  252. +134 −0 config/locales/pt-BR.yml
  253. +12 −0 config/locales/pt-PT.yml
  254. +37 −8 config/locales/ru.yml
  255. +1 −0 config/locales/simple_form.ar.yml
  256. +12 −12 config/locales/simple_form.ca.yml
  257. +2 −0 config/locales/simple_form.cy.yml
  258. +171 −1 config/locales/simple_form.he.yml
  259. +3 −3 config/locales/simple_form.hu.yml
  260. +187 −0 config/locales/simple_form.io.yml
  261. +6 −6 config/locales/simple_form.ko.yml
  262. +4 −4 config/locales/simple_form.ru.yml
  263. +48 −15 config/locales/simple_form.sl.yml
  264. +5 −0 config/locales/simple_form.uk.yml
  265. +26 −26 config/locales/simple_form.zh-TW.yml
  266. +1 −0 config/locales/sk.yml
  267. +670 −50 config/locales/sl.yml
  268. +7 −0 config/locales/sq.yml
  269. +5 −0 config/locales/sv.yml
  270. +20 −6 config/locales/th.yml
  271. +10 −0 config/locales/tr.yml
  272. +68 −18 config/locales/uk.yml
  273. +13 −3 config/locales/vi.yml
  274. +20 −10 config/locales/zh-CN.yml
  275. +170 −160 config/locales/zh-TW.yml
  276. +4 −0 config/sidekiq.yml
  277. +32 −0 jest.config.js
  278. +0 −11 lib/chewy/strategy/custom_sidekiq.rb
  279. +27 −0 lib/chewy/strategy/mastodon.rb
  280. +40 −89 lib/mastodon/search_cli.rb
  281. +1 −1 lib/mastodon/version.rb
  282. +8 −0 lib/tasks/mastodon.rake
  283. +21 −57 package.json
  284. +29 −7 public/embed.js
  285. +2 −2 spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
  286. +3 −3 spec/lib/emoji_formatter_spec.rb
  287. +0 −56 spec/lib/rss/serializer_spec.rb
  288. +174 −4 spec/models/account_spec.rb
  289. +20 −20 spec/services/activitypub/fetch_remote_status_service_spec.rb
  290. +2 −4 spec/services/fetch_remote_status_service_spec.rb
  291. +19 −0 spec/services/resolve_url_service_spec.rb
  292. +1,171 −1,017 yarn.lock
7 changes: 7 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[production]
defaults
not IE 11
not dead

[development]
supports es6-module
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"extensions": [
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint",
"rebornix.Ruby"
"rebornix.Ruby",
"webben.browserslist"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
Expand Down
47 changes: 47 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,53 @@ Changelog

All notable changes to this project will be documented in this file.

## [3.5.3] - 2022-05-26
### Added

- **Add language dropdown to compose form in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/18420), [ykzts](https://github.com/mastodon/mastodon/pull/18460))
- **Add warning for limited accounts in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/18344))
- Add `limited` attribute to accounts in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/18344))

### Changed

- **Change RSS feeds** ([Gargron](https://github.com/mastodon/mastodon/pull/18356), [tribela](https://github.com/mastodon/mastodon/pull/18406))
- Titles are now date and time of post
- Bodies now render all content faithfully, including polls and emojis
- All media attachments are included with Media RSS
- Change "dangerous" to "sensitive" in privacy policy and web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18515))
- Change unconfirmed accounts to not be visible in REST API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17530))
- Change `tootctl search deploy` to improve performance ([Gargron](https://github.com/mastodon/mastodon/pull/18463), [Gargron](https://github.com/mastodon/mastodon/pull/18514))
- Change search indexing to use batches to minimize resource usage ([Gargron](https://github.com/mastodon/mastodon/pull/18451))

### Fixed

- Fix follower and other counters being able to go negative ([Gargron](https://github.com/mastodon/mastodon/pull/18517))
- Fix unnecessary query on when creating a status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17901))
- Fix warning an account outside of a report closing all reports for that account ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18387))
- Fix error when resolving a link that redirects to a local post ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18314))
- Fix preferred posting language returning unusable value in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/18428))
- Fix race condition error when external status is reblogged ([ykzts](https://github.com/mastodon/mastodon/pull/18424))
- Fix missing string for appeal validation error ([Gargron](https://github.com/mastodon/mastodon/pull/18410))
- Fix block/mute lists showing a follow button in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18364))
- Fix Redis configuration not being changed by `mastodon:setup` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18383))
- Fix streaming notifications not using quick filter logic in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18316))
- Fix ambiguous wording on appeal actions in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18328))
- Fix floating action button obscuring last element in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18332))
- Fix account warnings not being recorded in audit log ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18338))
- Fix leftover icons for direct visibility statuses ([Steffo99](https://github.com/mastodon/mastodon/pull/18305))
- Fix link verification requiring case sensitivity on links ([sgolemon](https://github.com/mastodon/mastodon/pull/18320))
- Fix embeds not setting their height correctly ([rinsuki](https://github.com/mastodon/mastodon/pull/18301))

### Security

- Fix concurrent unfollowing decrementing follower count more than once ([Gargron](https://github.com/mastodon/mastodon/pull/18527))
- Fix being able to appeal a strike unlimited times ([Gargron](https://github.com/mastodon/mastodon/pull/18529))
- Fix being able to report otherwise inaccessible statuses ([Gargron](https://github.com/mastodon/mastodon/pull/18528))
- Fix empty votes arbitrarily increasing voters count in polls ([Gargron](https://github.com/mastodon/mastodon/pull/18526))
- Fix moderator identity leak when approving appeal of sensitive marked statuses ([Gargron](https://github.com/mastodon/mastodon/pull/18525))
- Fix suspended users being able to access APIs that don't require a user ([Gargron](https://github.com/mastodon/mastodon/pull/18524))
- Fix confirmation redirect to app without `Location` header ([Gargron](https://github.com/mastodon/mastodon/pull/18523))

## [3.5.2] - 2022-05-04
### Added

Expand Down
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'pkg-config', '~> 1.4'
gem 'rexml', '~> 3.2'

gem 'puma', '~> 5.6'
gem 'rails', '~> 6.1.5'
gem 'rails', '~> 6.1.6'
gem 'sprockets', '~> 3.7.2'
gem 'thor', '~> 1.2'
gem 'rack', '~> 2.2.3'
Expand All @@ -18,7 +18,7 @@ gem 'makara', '~> 0.5'
gem 'pghero', '~> 2.8'
gem 'dotenv-rails', '~> 2.7'

gem 'aws-sdk-s3', '~> 1.113', require: false
gem 'aws-sdk-s3', '~> 1.114', require: false
gem 'fog-core', '<= 2.1.0'
gem 'fog-openstack', '~> 0.3', require: false
gem 'kt-paperclip', '~> 7.1'
Expand Down Expand Up @@ -79,13 +79,13 @@ gem 'ruby-progressbar', '~> 1.11'
gem 'sanitize', '~> 6.0'
gem 'scenic', '~> 1.6'
gem 'sidekiq', '~> 6.4'
gem 'sidekiq-scheduler', '~> 3.2'
gem 'sidekiq-scheduler', '~> 4.0'
gem 'sidekiq-unique-jobs', '~> 7.1'
gem 'sidekiq-bulk', '~>0.2.0'
gem 'sidekiq-bulk', '~> 0.2.0'
gem 'simple-navigation', '~> 4.3'
gem 'simple_form', '~> 5.1'
gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
gem 'stoplight', '~> 2.2.1'
gem 'stoplight', '~> 3.0.0'
gem 'strong_migrations', '~> 0.7'
gem 'tty-prompt', '~> 0.23', require: false
gem 'twitter-text', '~> 3.1.0'
Expand All @@ -112,9 +112,9 @@ group :production, :test do
end

group :test do
gem 'capybara', '~> 3.36'
gem 'capybara', '~> 3.37'
gem 'climate_control', '~> 0.2'
gem 'faker', '~> 2.20'
gem 'faker', '~> 2.21'
gem 'microformats', '~> 4.2'
gem 'rails-controller-testing', '~> 1.0'
gem 'rspec-sidekiq', '~> 3.1'
Expand All @@ -132,7 +132,7 @@ group :development do
gem 'letter_opener', '~> 1.8'
gem 'letter_opener_web', '~> 2.0'
gem 'memory_profiler'
gem 'rubocop', '~> 1.27', require: false
gem 'rubocop', '~> 1.29', require: false
gem 'rubocop-rails', '~> 2.14', require: false
gem 'brakeman', '~> 5.2', require: false
gem 'bundler-audit', '~> 0.9', require: false
Expand Down
Loading