fat_free_crm 0.18.1 → 0.20.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of fat_free_crm might be problematic. Click here for more details.

Files changed (385) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/brakeman-analysis.yml +46 -0
  3. data/.github/workflows/rubocop-analysis.yml +40 -0
  4. data/.github/workflows/ruby.yml +52 -0
  5. data/.rubocop_todo.yml +80 -173
  6. data/.travis.yml +17 -20
  7. data/CHANGELOG.md +63 -3
  8. data/CONTRIBUTORS.md +1 -0
  9. data/Dockerfile +45 -14
  10. data/Gemfile +21 -11
  11. data/Gemfile.lock +315 -263
  12. data/Procfile +1 -1
  13. data/README.md +6 -5
  14. data/Rakefile +1 -1
  15. data/SECURITY.md +11 -0
  16. data/app/assets/javascripts/application.js.erb +3 -0
  17. data/app/assets/stylesheets/application.css.erb +1 -0
  18. data/app/assets/stylesheets/base.scss +9 -2
  19. data/app/assets/stylesheets/bootstrap-custom.scss +206 -0
  20. data/app/assets/stylesheets/common.scss +88 -68
  21. data/app/assets/stylesheets/header.scss +0 -8
  22. data/app/controllers/admin/application_controller.rb +1 -1
  23. data/app/controllers/admin/field_groups_controller.rb +2 -4
  24. data/app/controllers/admin/fields_controller.rb +1 -1
  25. data/app/controllers/admin/groups_controller.rb +1 -1
  26. data/app/controllers/admin/tags_controller.rb +3 -5
  27. data/app/controllers/admin/users_controller.rb +7 -9
  28. data/app/controllers/application_controller.rb +21 -45
  29. data/app/controllers/comments_controller.rb +3 -6
  30. data/{config/initializers/authlogic.rb → app/controllers/confirmations_controller.rb} +4 -2
  31. data/app/controllers/emails_controller.rb +0 -2
  32. data/app/controllers/entities/accounts_controller.rb +2 -4
  33. data/app/controllers/entities/campaigns_controller.rb +2 -4
  34. data/app/controllers/entities/contacts_controller.rb +4 -24
  35. data/app/controllers/entities/leads_controller.rb +7 -10
  36. data/app/controllers/entities/opportunities_controller.rb +4 -14
  37. data/app/controllers/entities_controller.rb +21 -7
  38. data/app/controllers/home_controller.rb +5 -5
  39. data/app/controllers/lists_controller.rb +1 -1
  40. data/app/controllers/passwords_controller.rb +3 -59
  41. data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb} +12 -5
  42. data/{lib/development_tasks/gem.rake → app/controllers/sessions_controller.rb} +6 -6
  43. data/app/controllers/tasks_controller.rb +11 -20
  44. data/app/controllers/users_controller.rb +11 -30
  45. data/app/helpers/accounts_helper.rb +12 -0
  46. data/app/helpers/admin/users_helper.rb +1 -1
  47. data/app/helpers/application_helper.rb +30 -37
  48. data/app/helpers/campaigns_helper.rb +1 -1
  49. data/app/helpers/contacts_helper.rb +1 -3
  50. data/app/helpers/opportunities_helper.rb +4 -12
  51. data/app/helpers/tasks_helper.rb +3 -3
  52. data/app/helpers/users_helper.rb +1 -3
  53. data/{config/initializers/paper_trail.rb → app/mailers/devise_mailer.rb} +5 -1
  54. data/app/mailers/user_mailer.rb +0 -9
  55. data/app/models/entities/account.rb +11 -11
  56. data/app/models/entities/account_contact.rb +1 -1
  57. data/app/models/entities/account_opportunity.rb +1 -1
  58. data/app/models/entities/campaign.rb +5 -7
  59. data/app/models/entities/contact.rb +25 -13
  60. data/app/models/entities/lead.rb +8 -8
  61. data/app/models/entities/opportunity.rb +8 -10
  62. data/app/models/fields/custom_field.rb +1 -0
  63. data/app/models/fields/custom_field_date_pair.rb +2 -0
  64. data/app/models/fields/custom_field_pair.rb +2 -2
  65. data/app/models/fields/field.rb +1 -3
  66. data/app/models/list.rb +1 -1
  67. data/app/models/observers/entity_observer.rb +3 -7
  68. data/app/models/observers/lead_observer.rb +2 -4
  69. data/app/models/observers/opportunity_observer.rb +3 -5
  70. data/app/models/observers/task_observer.rb +1 -1
  71. data/app/models/polymorphic/address.rb +1 -1
  72. data/app/models/polymorphic/comment.rb +1 -1
  73. data/app/models/polymorphic/email.rb +3 -3
  74. data/app/models/polymorphic/task.rb +14 -10
  75. data/app/models/polymorphic/version.rb +3 -2
  76. data/app/models/setting.rb +5 -1
  77. data/app/models/users/permission.rb +3 -3
  78. data/app/models/users/preference.rb +4 -3
  79. data/app/models/users/user.rb +67 -42
  80. data/app/views/accounts/_edit.html.haml +2 -2
  81. data/app/views/accounts/_new.html.haml +2 -2
  82. data/app/views/accounts/_sidebar_index.html.haml +2 -2
  83. data/app/views/accounts/_sidebar_show.html.haml +19 -19
  84. data/app/views/accounts/_top_section.html.haml +1 -1
  85. data/app/views/accounts/create.js.haml +1 -2
  86. data/app/views/accounts/destroy.js.haml +1 -1
  87. data/app/views/accounts/edit.js.haml +1 -1
  88. data/app/views/accounts/show.html.haml +1 -0
  89. data/app/views/accounts/update.js.haml +4 -5
  90. data/app/views/admin/field_groups/create.js.haml +0 -1
  91. data/app/views/admin/field_groups/destroy.js.haml +0 -1
  92. data/app/views/admin/field_groups/update.js.haml +0 -1
  93. data/app/views/admin/fields/create.js.haml +0 -1
  94. data/app/views/admin/fields/destroy.js.haml +0 -1
  95. data/app/views/admin/fields/update.js.haml +0 -1
  96. data/app/views/admin/groups/create.js.haml +0 -1
  97. data/app/views/admin/groups/destroy.js.haml +0 -1
  98. data/app/views/admin/groups/update.js.haml +0 -1
  99. data/app/views/admin/tags/create.js.haml +0 -1
  100. data/app/views/admin/tags/destroy.js.haml +0 -1
  101. data/app/views/admin/tags/update.js.haml +0 -1
  102. data/app/views/admin/users/_user.html.haml +4 -4
  103. data/app/views/admin/users/create.js.haml +0 -1
  104. data/app/views/admin/users/destroy.js.haml +0 -1
  105. data/app/views/admin/users/update.js.haml +0 -1
  106. data/app/views/campaigns/_edit.html.haml +1 -1
  107. data/app/views/campaigns/_new.html.haml +1 -1
  108. data/app/views/campaigns/_sidebar_index.html.haml +2 -2
  109. data/app/views/campaigns/_sidebar_show.html.haml +68 -67
  110. data/app/views/campaigns/create.js.haml +1 -2
  111. data/app/views/campaigns/destroy.js.haml +1 -1
  112. data/app/views/campaigns/show.html.haml +1 -0
  113. data/app/views/campaigns/update.js.haml +3 -4
  114. data/app/views/comments/_edit.html.haml +1 -1
  115. data/app/views/comments/_new.html.haml +1 -1
  116. data/app/views/comments/update.js.haml +0 -1
  117. data/app/views/contacts/_edit.html.haml +1 -1
  118. data/app/views/contacts/_index_brief.html.haml +1 -1
  119. data/app/views/contacts/_index_full.html.haml +1 -1
  120. data/app/views/contacts/_index_long.html.haml +1 -1
  121. data/app/views/contacts/_new.html.haml +1 -1
  122. data/app/views/contacts/_sidebar_show.html.haml +18 -18
  123. data/app/views/contacts/create.js.haml +0 -1
  124. data/app/views/contacts/destroy.js.haml +1 -1
  125. data/app/views/contacts/show.html.haml +1 -0
  126. data/app/views/contacts/update.js.haml +2 -3
  127. data/app/views/devise/confirmations/new.html.haml +9 -0
  128. data/app/views/devise/mailer/confirmation_instructions.html.haml +4 -0
  129. data/app/views/devise/mailer/password_change.html.haml +3 -0
  130. data/app/views/devise/mailer/reset_password_instructions.html.haml +6 -0
  131. data/app/views/devise/passwords/edit.html.haml +18 -0
  132. data/app/views/devise/passwords/new.html.haml +10 -0
  133. data/app/views/devise/registrations/new.html.haml +21 -0
  134. data/app/views/devise/sessions/new.html.haml +32 -0
  135. data/app/views/entities/_title_bar.html.haml +1 -1
  136. data/app/views/entities/attach.js.haml +2 -2
  137. data/app/views/entities/discard.js.haml +2 -2
  138. data/app/views/home/_opportunity.html.haml +1 -1
  139. data/app/views/home/_task.html.haml +1 -1
  140. data/app/views/home/index.xls.builder +51 -0
  141. data/app/views/layouts/_about.html.haml +5 -5
  142. data/app/views/layouts/_header.html.haml +3 -3
  143. data/app/views/layouts/_sidebar.html.haml +2 -2
  144. data/app/views/layouts/_tabbed.html.haml +14 -11
  145. data/app/views/layouts/admin/_header.html.haml +1 -1
  146. data/app/views/layouts/application.html.haml +2 -2
  147. data/app/views/leads/_edit.html.haml +2 -2
  148. data/app/views/leads/_new.html.haml +2 -2
  149. data/app/views/leads/_sidebar_index.html.haml +2 -2
  150. data/app/views/leads/_sidebar_show.html.haml +30 -30
  151. data/app/views/leads/create.js.haml +2 -3
  152. data/app/views/leads/destroy.js.haml +2 -2
  153. data/app/views/leads/promote.js.haml +3 -4
  154. data/app/views/leads/reject.js.haml +3 -3
  155. data/app/views/leads/show.html.haml +1 -1
  156. data/app/views/leads/update.js.haml +4 -5
  157. data/app/views/lists/create.js.haml +0 -1
  158. data/app/views/opportunities/_edit.html.haml +1 -1
  159. data/app/views/opportunities/_index_brief.html.haml +1 -1
  160. data/app/views/opportunities/_index_long.html.haml +1 -1
  161. data/app/views/opportunities/_new.html.haml +1 -1
  162. data/app/views/opportunities/_sidebar_index.html.haml +2 -2
  163. data/app/views/opportunities/_sidebar_show.html.haml +47 -46
  164. data/app/views/opportunities/create.js.haml +3 -4
  165. data/app/views/opportunities/destroy.js.haml +3 -3
  166. data/app/views/opportunities/show.html.haml +1 -0
  167. data/app/views/opportunities/update.js.haml +5 -6
  168. data/app/views/shared/_address.html.haml +5 -5
  169. data/app/views/shared/_empty.html.haml +1 -1
  170. data/app/views/shared/_inline_styles.html.haml +0 -26
  171. data/app/views/shared/_paginate_with_per_page.html.haml +1 -0
  172. data/app/views/tasks/_assigned.html.haml +1 -1
  173. data/app/views/tasks/_completed.html.haml +1 -1
  174. data/app/views/tasks/_edit.html.haml +1 -1
  175. data/app/views/tasks/_new.html.haml +1 -1
  176. data/app/views/tasks/_pending.html.haml +1 -1
  177. data/app/views/tasks/_related.html.haml +1 -1
  178. data/app/views/tasks/_selector.html.haml +7 -8
  179. data/app/views/tasks/_sidebar_index.html.haml +2 -2
  180. data/app/views/tasks/_title.html.haml +1 -1
  181. data/app/views/tasks/complete.js.haml +1 -1
  182. data/app/views/tasks/create.js.haml +1 -2
  183. data/app/views/tasks/destroy.js.haml +1 -1
  184. data/app/views/tasks/uncomplete.js.haml +1 -2
  185. data/app/views/tasks/update.js.haml +0 -1
  186. data/app/views/users/_avatar.html.haml +1 -1
  187. data/app/views/users/change_password.js.haml +0 -1
  188. data/app/views/users/update.js.haml +0 -1
  189. data/app/views/users/upload_avatar.js.haml +0 -1
  190. data/app/views/versions/_version_item.html.haml +1 -1
  191. data/bin/bundle +1 -1
  192. data/bin/rails +1 -1
  193. data/bin/setup +38 -0
  194. data/bin/update +33 -0
  195. data/bin/yarn +13 -0
  196. data/config/application.rb +8 -6
  197. data/config/boot.rb +1 -1
  198. data/config/brakeman.ignore +2 -2
  199. data/config/database.postgres.docker.yml +5 -5
  200. data/config/environment.rb +2 -2
  201. data/config/environments/development.rb +1 -0
  202. data/config/environments/test.rb +7 -0
  203. data/config/initializers/action_mailer.rb +1 -3
  204. data/config/initializers/application_controller_renderer.rb +9 -0
  205. data/config/initializers/assets.rb +6 -11
  206. data/config/initializers/backtrace_silencers.rb +0 -6
  207. data/config/initializers/content_security_policy.rb +31 -0
  208. data/config/initializers/cookies_serializer.rb +3 -6
  209. data/config/initializers/devise.rb +289 -0
  210. data/config/initializers/filter_parameter_logging.rb +0 -5
  211. data/config/initializers/gravatar.rb +0 -1
  212. data/config/initializers/inflections.rb +0 -6
  213. data/config/initializers/mime_types.rb +1 -9
  214. data/config/initializers/new_framework_defaults_6_0.rb +46 -0
  215. data/config/initializers/relative_url_root.rb +1 -3
  216. data/config/initializers/session_store.rb +1 -3
  217. data/config/initializers/simple_form.rb +135 -55
  218. data/config/initializers/simple_form_bootstrap.rb +433 -0
  219. data/config/initializers/wrap_parameters.rb +4 -9
  220. data/config/locales/fat_free_crm.cs.yml +86 -47
  221. data/config/locales/fat_free_crm.en-GB.yml +5 -5
  222. data/config/locales/fat_free_crm.en-US.yml +5 -5
  223. data/config/locales/fat_free_crm.fr.yml +1 -1
  224. data/config/locales/fat_free_crm.ru.yml +2 -0
  225. data/config/routes.rb +20 -9
  226. data/config/settings.default.yml +0 -41
  227. data/db/demo/users.yml +62 -81
  228. data/db/migrate/20100928030620_remove_uuid.rb +1 -2
  229. data/db/migrate/20120316045804_activities_to_versions.rb +1 -0
  230. data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +1 -0
  231. data/db/migrate/20180107082701_authlogic_to_devise.rb +58 -0
  232. data/db/migrate/20200806004152_add_pattern_to_fields.rb +7 -0
  233. data/db/migrate/20200806004459_add_html5_to_fields.rb +10 -0
  234. data/db/schema.rb +58 -48
  235. data/docker-compose.yml +10 -0
  236. data/fat_free_crm.gemspec +13 -15
  237. data/lib/development_tasks/license.rake +2 -2
  238. data/lib/fat_free_crm/callback.rb +2 -2
  239. data/lib/fat_free_crm/comment_extensions.rb +2 -4
  240. data/lib/fat_free_crm/core_ext/string.rb +1 -1
  241. data/lib/fat_free_crm/core_ext.rb +1 -1
  242. data/lib/fat_free_crm/engine.rb +1 -1
  243. data/lib/fat_free_crm/errors.rb +1 -1
  244. data/lib/fat_free_crm/export_csv.rb +1 -0
  245. data/lib/fat_free_crm/exportable.rb +1 -1
  246. data/lib/fat_free_crm/fields.rb +1 -1
  247. data/lib/fat_free_crm/gem_dependencies.rb +1 -1
  248. data/lib/fat_free_crm/gem_ext.rb +0 -1
  249. data/lib/fat_free_crm/i18n.rb +2 -2
  250. data/lib/fat_free_crm/mail_processor/base.rb +4 -10
  251. data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -15
  252. data/lib/fat_free_crm/permissions.rb +7 -4
  253. data/lib/fat_free_crm/sortable.rb +1 -1
  254. data/lib/fat_free_crm/tabs.rb +2 -2
  255. data/lib/fat_free_crm/version.rb +2 -2
  256. data/lib/gravatar_image_tag.rb +8 -9
  257. data/lib/missing_translation_detector.rb +1 -0
  258. data/lib/tasks/ffcrm/missing_translations.rake +1 -0
  259. data/lib/tasks/ffcrm/preference_update.rake +19 -0
  260. data/lib/tasks/ffcrm/setup.rake +11 -2
  261. data/lib/tasks/ffcrm/update_data.rake +2 -2
  262. data/lib/templates/erb/scaffold/_form.html.erb +4 -2
  263. data/script/rails +2 -2
  264. data/spec/controllers/admin/users_controller_spec.rb +0 -56
  265. data/spec/controllers/comments_controller_spec.rb +12 -12
  266. data/spec/controllers/entities/campaigns_controller_spec.rb +1 -1
  267. data/spec/controllers/entities/contacts_controller_spec.rb +2 -1
  268. data/spec/controllers/entities/leads_controller_spec.rb +2 -2
  269. data/spec/controllers/entities/opportunities_controller_spec.rb +1 -1
  270. data/spec/controllers/entities_controller_spec.rb +5 -0
  271. data/spec/controllers/home_controller_spec.rb +8 -8
  272. data/spec/controllers/tasks_controller_spec.rb +6 -4
  273. data/spec/controllers/users_controller_spec.rb +41 -99
  274. data/spec/factories/account_factories.rb +5 -5
  275. data/spec/factories/campaign_factories.rb +3 -3
  276. data/spec/factories/contact_factories.rb +8 -8
  277. data/spec/factories/field_factories.rb +4 -3
  278. data/spec/factories/lead_factories.rb +5 -5
  279. data/spec/factories/list_factories.rb +2 -2
  280. data/spec/factories/opportunity_factories.rb +3 -3
  281. data/spec/factories/setting_factories.rb +2 -2
  282. data/spec/factories/shared_factories.rb +11 -9
  283. data/spec/factories/task_factories.rb +7 -7
  284. data/spec/factories/user_factories.rb +21 -21
  285. data/spec/features/acceptance_helper.rb +1 -1
  286. data/spec/features/accounts_spec.rb +2 -2
  287. data/spec/features/admin/groups_spec.rb +2 -2
  288. data/spec/features/admin/users_spec.rb +4 -2
  289. data/spec/features/campaigns_spec.rb +3 -3
  290. data/spec/features/contacts_spec.rb +3 -6
  291. data/spec/features/dashboard_spec.rb +1 -1
  292. data/spec/features/devise/sign_in_spec.rb +58 -0
  293. data/spec/features/devise/sign_up_spec.rb +36 -0
  294. data/spec/features/leads_spec.rb +12 -8
  295. data/spec/features/opportunities_overview_spec.rb +1 -1
  296. data/spec/features/opportunities_spec.rb +7 -7
  297. data/spec/features/support/browser.rb +8 -3
  298. data/spec/features/support/selector_helpers.rb +10 -1
  299. data/spec/features/tasks_spec.rb +7 -7
  300. data/spec/helpers/accounts_helper_spec.rb +57 -0
  301. data/spec/helpers/admin/field_groups_helper_spec.rb +1 -1
  302. data/spec/helpers/users_helper_spec.rb +4 -4
  303. data/spec/lib/comment_extensions_spec.rb +10 -4
  304. data/spec/lib/errors_spec.rb +2 -2
  305. data/spec/lib/mail_processor/dropbox_spec.rb +1 -1
  306. data/spec/lib/mail_processor/sample_emails/dropbox.rb +8 -8
  307. data/spec/lib/permissions_spec.rb +8 -3
  308. data/spec/mailers/devise_mailer_spec.rb +35 -0
  309. data/spec/mailers/user_mailer_spec.rb +0 -26
  310. data/spec/models/entities/account_spec.rb +27 -0
  311. data/spec/models/entities/contact_spec.rb +96 -1
  312. data/spec/models/entities/opportunity_spec.rb +2 -2
  313. data/spec/models/fields/custom_field_date_pair_spec.rb +4 -2
  314. data/spec/models/fields/custom_field_pair_spec.rb +2 -2
  315. data/spec/models/fields/custom_field_spec.rb +4 -2
  316. data/spec/models/observers/entity_observer_spec.rb +4 -4
  317. data/spec/models/polymorphic/task_spec.rb +11 -11
  318. data/spec/models/polymorphic/version_spec.rb +9 -9
  319. data/spec/models/users/preference_spec.rb +1 -1
  320. data/spec/models/users/user_spec.rb +22 -26
  321. data/spec/routing/users_routing_spec.rb +30 -8
  322. data/spec/shared/controllers.rb +3 -9
  323. data/spec/spec_helper.rb +10 -2
  324. data/spec/support/assert_select.rb +1 -0
  325. data/spec/support/devise_helpers.rb +28 -0
  326. data/spec/{features/support/helpers.rb → support/feature_helpers.rb} +10 -10
  327. data/spec/support/macros.rb +4 -1
  328. data/spec/views/accounts/_edit.haml_spec.rb +1 -1
  329. data/spec/views/accounts/_new.haml_spec.rb +1 -1
  330. data/spec/views/accounts/create.js.haml_spec.rb +1 -2
  331. data/spec/views/accounts/update.js.haml_spec.rb +2 -5
  332. data/spec/views/admin/field_groups/create.js.haml_spec.rb +0 -1
  333. data/spec/views/admin/field_groups/update.js.haml_spec.rb +0 -1
  334. data/spec/views/admin/users/create.js.haml_spec.rb +0 -1
  335. data/spec/views/admin/users/destroy.js.haml_spec.rb +0 -6
  336. data/spec/views/admin/users/update.js.haml_spec.rb +1 -2
  337. data/spec/views/campaigns/_edit.haml_spec.rb +1 -1
  338. data/spec/views/campaigns/_new.haml_spec.rb +1 -1
  339. data/spec/views/campaigns/create.js.haml_spec.rb +1 -2
  340. data/spec/views/campaigns/destroy.js.haml_spec.rb +0 -1
  341. data/spec/views/campaigns/edit.js.haml_spec.rb +2 -2
  342. data/spec/views/campaigns/index.js.haml_spec.rb +1 -1
  343. data/spec/views/campaigns/update.js.haml_spec.rb +3 -7
  344. data/spec/views/contacts/_edit.haml_spec.rb +1 -1
  345. data/spec/views/contacts/_new.haml_spec.rb +1 -1
  346. data/spec/views/contacts/create.js.haml_spec.rb +1 -2
  347. data/spec/views/contacts/edit.js.haml_spec.rb +1 -1
  348. data/spec/views/contacts/index.js.html_spec.rb +1 -1
  349. data/spec/views/contacts/update.js.haml_spec.rb +6 -10
  350. data/spec/views/home/index.haml_spec.rb +2 -2
  351. data/spec/views/leads/_edit.haml_spec.rb +1 -1
  352. data/spec/views/leads/_new.haml_spec.rb +1 -1
  353. data/spec/views/leads/create.js.haml_spec.rb +0 -3
  354. data/spec/views/leads/destroy.js.haml_spec.rb +0 -2
  355. data/spec/views/leads/promote.js.haml_spec.rb +3 -11
  356. data/spec/views/leads/reject.js.haml_spec.rb +0 -3
  357. data/spec/views/leads/update.js.haml_spec.rb +3 -11
  358. data/spec/views/opportunities/_edit.haml_spec.rb +1 -1
  359. data/spec/views/opportunities/_new.haml_spec.rb +1 -1
  360. data/spec/views/opportunities/create.js.haml_spec.rb +0 -2
  361. data/spec/views/opportunities/destroy.js.haml_spec.rb +0 -3
  362. data/spec/views/opportunities/update.js.haml_spec.rb +4 -12
  363. data/spec/views/tasks/_edit.haml_spec.rb +1 -1
  364. data/spec/views/tasks/complete.js.haml_spec.rb +0 -1
  365. data/spec/views/tasks/create.js.haml_spec.rb +0 -2
  366. data/spec/views/tasks/destroy.js.haml_spec.rb +0 -1
  367. data/spec/views/tasks/uncomplete.js.haml_spec.rb +0 -1
  368. data/spec/views/tasks/update.js.haml_spec.rb +1 -4
  369. data/spec/views/users/change_password.js.haml_spec.rb +1 -2
  370. data/spec/views/users/update.js.haml_spec.rb +1 -2
  371. data/spec/views/users/upload_avatar.js.haml_spec.rb +1 -2
  372. metadata +63 -77
  373. data/app/controllers/authentications_controller.rb +0 -53
  374. data/app/models/users/authentication.rb +0 -56
  375. data/app/views/authentications/new.html.haml +0 -19
  376. data/app/views/passwords/edit.html.haml +0 -15
  377. data/app/views/passwords/new.html.haml +0 -10
  378. data/app/views/user_mailer/password_reset_instructions.html.haml +0 -6
  379. data/app/views/users/new.html.haml +0 -19
  380. data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +0 -26
  381. data/spec/controllers/authentications_controller_spec.rb +0 -150
  382. data/spec/controllers/passwords_controller_spec.rb +0 -32
  383. data/spec/models/users/authentication_spec.rb +0 -19
  384. data/spec/support/auth_macros.rb +0 -49
  385. data/spec/views/authentications/new.haml_spec.rb +0 -31
data/Gemfile.lock CHANGED
@@ -1,152 +1,185 @@
1
+ GIT
2
+ remote: https://github.com/CloCkWeRX/responds_to_parent.git
3
+ revision: fc42ea13be78b065a7975564b1828d6feaef8660
4
+ branch: patch-1
5
+ specs:
6
+ responds_to_parent (2.0.0)
7
+ actionpack (>= 3.2.22, < 6.1)
8
+
9
+ GIT
10
+ remote: https://github.com/fatfreecrm/acts_as_commentable.git
11
+ revision: eb811316ffbfc66612060822a505d64676564f57
12
+ branch: rails-6
13
+ specs:
14
+ acts_as_commentable (6.0.0)
15
+ activerecord (~> 6.0.0)
16
+
1
17
  GEM
2
18
  remote: https://rubygems.org/
3
19
  specs:
4
- actioncable (5.1.6)
5
- actionpack (= 5.1.6)
20
+ actioncable (6.0.4.1)
21
+ actionpack (= 6.0.4.1)
6
22
  nio4r (~> 2.0)
7
- websocket-driver (~> 0.6.1)
8
- actionmailer (5.1.6)
9
- actionpack (= 5.1.6)
10
- actionview (= 5.1.6)
11
- activejob (= 5.1.6)
23
+ websocket-driver (>= 0.6.1)
24
+ actionmailbox (6.0.4.1)
25
+ actionpack (= 6.0.4.1)
26
+ activejob (= 6.0.4.1)
27
+ activerecord (= 6.0.4.1)
28
+ activestorage (= 6.0.4.1)
29
+ activesupport (= 6.0.4.1)
30
+ mail (>= 2.7.1)
31
+ actionmailer (6.0.4.1)
32
+ actionpack (= 6.0.4.1)
33
+ actionview (= 6.0.4.1)
34
+ activejob (= 6.0.4.1)
12
35
  mail (~> 2.5, >= 2.5.4)
13
36
  rails-dom-testing (~> 2.0)
14
- actionpack (5.1.6)
15
- actionview (= 5.1.6)
16
- activesupport (= 5.1.6)
17
- rack (~> 2.0)
37
+ actionpack (6.0.4.1)
38
+ actionview (= 6.0.4.1)
39
+ activesupport (= 6.0.4.1)
40
+ rack (~> 2.0, >= 2.0.8)
18
41
  rack-test (>= 0.6.3)
19
42
  rails-dom-testing (~> 2.0)
20
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
21
- actionview (5.1.6)
22
- activesupport (= 5.1.6)
43
+ rails-html-sanitizer (~> 1.0, >= 1.2.0)
44
+ actiontext (6.0.4.1)
45
+ actionpack (= 6.0.4.1)
46
+ activerecord (= 6.0.4.1)
47
+ activestorage (= 6.0.4.1)
48
+ activesupport (= 6.0.4.1)
49
+ nokogiri (>= 1.8.5)
50
+ actionview (6.0.4.1)
51
+ activesupport (= 6.0.4.1)
23
52
  builder (~> 3.1)
24
53
  erubi (~> 1.4)
25
54
  rails-dom-testing (~> 2.0)
26
- rails-html-sanitizer (~> 1.0, >= 1.0.3)
27
- activejob (5.1.6)
28
- activesupport (= 5.1.6)
55
+ rails-html-sanitizer (~> 1.1, >= 1.2.0)
56
+ activejob (6.0.4.1)
57
+ activesupport (= 6.0.4.1)
29
58
  globalid (>= 0.3.6)
30
- activemodel (5.1.6)
31
- activesupport (= 5.1.6)
59
+ activemodel (6.0.4.1)
60
+ activesupport (= 6.0.4.1)
32
61
  activemodel-serializers-xml (1.0.2)
33
62
  activemodel (> 5.x)
34
63
  activesupport (> 5.x)
35
64
  builder (~> 3.1)
36
- activerecord (5.1.6)
37
- activemodel (= 5.1.6)
38
- activesupport (= 5.1.6)
39
- arel (~> 8.0)
40
- activesupport (5.1.6)
65
+ activerecord (6.0.4.1)
66
+ activemodel (= 6.0.4.1)
67
+ activesupport (= 6.0.4.1)
68
+ activestorage (6.0.4.1)
69
+ actionpack (= 6.0.4.1)
70
+ activejob (= 6.0.4.1)
71
+ activerecord (= 6.0.4.1)
72
+ marcel (~> 1.0.0)
73
+ activesupport (6.0.4.1)
41
74
  concurrent-ruby (~> 1.0, >= 1.0.2)
42
75
  i18n (>= 0.7, < 2)
43
76
  minitest (~> 5.1)
44
77
  tzinfo (~> 1.1)
45
- acts-as-taggable-on (5.0.0)
46
- activerecord (>= 4.2.8)
47
- acts_as_commentable (4.0.2)
48
- acts_as_fu (0.0.9)
49
- activerecord
50
- sqlite3
51
- acts_as_list (0.9.10)
52
- activerecord (>= 3.0)
53
- addressable (2.5.2)
54
- public_suffix (>= 2.0.2, < 4.0)
55
- airbrussh (1.3.0)
78
+ zeitwerk (~> 2.2, >= 2.2.2)
79
+ acts-as-taggable-on (8.1.0)
80
+ activerecord (>= 5.0, < 6.2)
81
+ acts_as_list (1.0.4)
82
+ activerecord (>= 4.2)
83
+ addressable (2.8.0)
84
+ public_suffix (>= 2.0.2, < 5.0)
85
+ airbrussh (1.4.0)
56
86
  sshkit (>= 1.6.1, != 1.7.0)
57
- archive-zip (0.11.0)
58
- io-like (~> 0.3.0)
59
- arel (8.0.0)
60
- ast (2.4.0)
61
- authlogic (3.8.0)
62
- activerecord (>= 3.2, < 5.3)
63
- activesupport (>= 3.2, < 5.3)
64
- request_store (~> 1.0)
65
- scrypt (>= 1.2, < 4.0)
66
- bootsnap (1.1.8)
87
+ ast (2.4.2)
88
+ autoprefixer-rails (10.3.3.0)
89
+ execjs (~> 2)
90
+ bcrypt (3.1.16)
91
+ bootsnap (1.9.1)
67
92
  msgpack (~> 1.0)
68
- brakeman (4.1.1)
69
- builder (3.2.3)
70
- byebug (10.0.0)
71
- cancancan (2.1.3)
72
- capistrano (3.10.1)
93
+ bootstrap (5.0.0)
94
+ autoprefixer-rails (>= 9.1.0)
95
+ popper_js (>= 2.9.2, < 3)
96
+ sassc-rails (>= 2.0.0)
97
+ brakeman (5.1.1)
98
+ builder (3.2.4)
99
+ byebug (11.1.3)
100
+ cancancan (3.0.2)
101
+ capistrano (3.16.0)
73
102
  airbrussh (>= 1.0.0)
74
103
  i18n
75
104
  rake (>= 10.0.0)
76
105
  sshkit (>= 1.9.0)
77
- capistrano-bundler (1.3.0)
106
+ capistrano-bundler (2.0.1)
78
107
  capistrano (~> 3.1)
79
- sshkit (~> 1.2)
80
- capistrano-rails (1.3.1)
108
+ capistrano-rails (1.6.1)
81
109
  capistrano (~> 3.1)
82
- capistrano-bundler (~> 1.1)
110
+ capistrano-bundler (>= 1.1, < 3)
83
111
  capistrano-rvm (0.1.2)
84
112
  capistrano (~> 3.0)
85
113
  sshkit (~> 1.2)
86
- capybara (2.18.0)
114
+ capybara (3.35.3)
87
115
  addressable
88
116
  mini_mime (>= 0.1.3)
89
- nokogiri (>= 1.3.3)
90
- rack (>= 1.0.0)
91
- rack-test (>= 0.5.4)
92
- xpath (>= 2.0, < 4.0)
93
- childprocess (0.8.0)
94
- ffi (~> 1.0, >= 1.0.11)
95
- chromedriver-helper (1.2.0)
96
- archive-zip (~> 0.10)
97
117
  nokogiri (~> 1.8)
118
+ rack (>= 1.6.0)
119
+ rack-test (>= 0.6.3)
120
+ regexp_parser (>= 1.5, < 3.0)
121
+ xpath (~> 3.2)
122
+ childprocess (3.0.0)
98
123
  chronic (0.10.2)
99
124
  climate_control (0.2.0)
100
- cocaine (0.5.8)
101
- climate_control (>= 0.0.3, < 1.0)
102
- coderay (1.1.2)
103
- coffee-rails (4.2.2)
125
+ coderay (1.1.3)
126
+ coffee-rails (5.0.0)
104
127
  coffee-script (>= 2.2.0)
105
- railties (>= 4.0.0)
128
+ railties (>= 5.2.0)
106
129
  coffee-script (2.4.1)
107
130
  coffee-script-source
108
131
  execjs
109
132
  coffee-script-source (1.12.2)
110
- concurrent-ruby (1.0.5)
111
- countries (2.1.4)
112
- i18n_data (~> 0.8.0)
113
- money (~> 6.9)
133
+ concurrent-ruby (1.1.9)
134
+ countries (4.0.1)
135
+ i18n_data (~> 0.13.0)
114
136
  sixarm_ruby_unaccent (~> 1.1)
115
- unicode_utils (~> 1.4)
116
- country_select (3.1.1)
117
- countries (~> 2.0)
118
- sort_alphabetical (~> 1.0)
119
- crass (1.0.4)
120
- css_parser (1.6.0)
137
+ country_select (6.0.0)
138
+ countries (~> 4.0)
139
+ sort_alphabetical (~> 1.1)
140
+ crass (1.0.6)
141
+ css_parser (1.10.0)
121
142
  addressable
122
- database_cleaner (1.6.2)
123
- diff-lcs (1.3)
143
+ database_cleaner (2.0.1)
144
+ database_cleaner-active_record (~> 2.0.0)
145
+ database_cleaner-active_record (2.0.1)
146
+ activerecord (>= 5.a)
147
+ database_cleaner-core (~> 2.0.0)
148
+ database_cleaner-core (2.0.1)
149
+ devise (4.8.0)
150
+ bcrypt (~> 3.0)
151
+ orm_adapter (~> 0.1)
152
+ railties (>= 4.1.0)
153
+ responders
154
+ warden (~> 1.2.3)
155
+ devise-encryptable (0.2.0)
156
+ devise (>= 2.1.0)
157
+ devise-i18n (1.10.0)
158
+ devise (>= 4.8.0)
159
+ diff-lcs (1.4.4)
124
160
  dynamic_form (1.1.4)
125
161
  email_reply_parser_ffcrm (0.5.0)
126
- erubi (1.7.1)
127
- execjs (2.7.0)
128
- factory_bot (4.8.2)
129
- activesupport (>= 3.0.0)
130
- factory_bot_rails (4.8.2)
131
- factory_bot (~> 4.8.2)
132
- railties (>= 3.0.0)
133
- ffaker (2.8.1)
134
- ffi (1.9.23)
135
- ffi-compiler (1.0.1)
136
- ffi (>= 1.0.0)
137
- rake
138
- font-awesome-rails (4.7.0.3)
139
- railties (>= 3.2, < 5.2)
140
- formatador (0.2.5)
141
- globalid (0.4.1)
162
+ erubi (1.10.0)
163
+ execjs (2.8.1)
164
+ factory_bot (5.2.0)
142
165
  activesupport (>= 4.2.0)
143
- guard (2.14.2)
166
+ factory_bot_rails (5.2.0)
167
+ factory_bot (~> 5.2.0)
168
+ railties (>= 4.2.0)
169
+ ffaker (2.19.0)
170
+ ffi (1.15.4)
171
+ font-awesome-rails (4.7.0.7)
172
+ railties (>= 3.2, < 7)
173
+ formatador (0.3.0)
174
+ globalid (0.5.2)
175
+ activesupport (>= 5.0)
176
+ guard (2.18.0)
144
177
  formatador (>= 0.2.4)
145
178
  listen (>= 2.7, < 4.0)
146
179
  lumberjack (>= 1.0.12, < 2.0)
147
180
  nenv (~> 0.1)
148
181
  notiffany (~> 0.0)
149
- pry (>= 0.9.12)
182
+ pry (>= 0.13.0)
150
183
  shellany (~> 0.0)
151
184
  thor (>= 0.18.1)
152
185
  guard-compat (1.2.1)
@@ -157,108 +190,115 @@ GEM
157
190
  guard (~> 2.1)
158
191
  guard-compat (~> 1.1)
159
192
  rspec (>= 2.99.0, < 4.0)
160
- haml (5.0.4)
193
+ haml (5.2.2)
161
194
  temple (>= 0.8.0)
162
195
  tilt
163
196
  headless (2.3.1)
164
197
  htmlentities (4.3.4)
165
- i18n (0.9.5)
198
+ i18n (1.8.10)
166
199
  concurrent-ruby (~> 1.0)
167
- i18n_data (0.8.0)
168
- io-like (0.3.0)
200
+ i18n_data (0.13.0)
201
+ jaro_winkler (1.5.4)
169
202
  jquery-migrate-rails (1.2.1)
170
- jquery-rails (4.3.1)
203
+ jquery-rails (4.4.0)
171
204
  rails-dom-testing (>= 1, < 3)
172
205
  railties (>= 4.2.0)
173
206
  thor (>= 0.14, < 2.0)
174
207
  jquery-ui-rails (6.0.1)
175
208
  railties (>= 3.2.16)
176
- libv8 (3.16.14.19)
177
- listen (3.1.5)
178
- rb-fsevent (~> 0.9, >= 0.9.4)
179
- rb-inotify (~> 0.9, >= 0.9.7)
180
- ruby_dep (~> 1.2)
181
- loofah (2.2.2)
209
+ libv8-node (15.14.0.1)
210
+ listen (3.7.0)
211
+ rb-fsevent (~> 0.10, >= 0.10.3)
212
+ rb-inotify (~> 0.9, >= 0.9.10)
213
+ loofah (2.12.0)
182
214
  crass (~> 1.0.2)
183
215
  nokogiri (>= 1.5.9)
184
- lumberjack (1.0.12)
185
- mail (2.7.0)
216
+ lumberjack (1.2.8)
217
+ mail (2.7.1)
186
218
  mini_mime (>= 0.1.1)
187
- method_source (0.9.0)
188
- mime-types (3.1)
219
+ marcel (1.0.2)
220
+ method_source (1.0.0)
221
+ mime-types (3.3.1)
189
222
  mime-types-data (~> 3.2015)
190
- mime-types-data (3.2016.0521)
191
- mimemagic (0.3.2)
192
- mini_mime (1.0.0)
193
- mini_portile2 (2.3.0)
194
- minitest (5.11.3)
195
- money (6.10.1)
196
- i18n (>= 0.6.4, < 1.0)
197
- msgpack (1.2.2)
223
+ mime-types-data (3.2021.0901)
224
+ mimemagic (0.3.10)
225
+ nokogiri (~> 1)
226
+ rake
227
+ mini_mime (1.1.1)
228
+ mini_portile2 (2.6.1)
229
+ mini_racer (0.4.0)
230
+ libv8-node (~> 15.14.0.0)
231
+ minitest (5.14.4)
232
+ msgpack (1.4.2)
198
233
  nenv (0.3.0)
199
- net-scp (1.2.1)
200
- net-ssh (>= 2.6.5)
201
- net-ssh (4.2.0)
202
- nio4r (2.3.0)
203
- nokogiri (1.8.2)
204
- mini_portile2 (~> 2.3.0)
205
- notiffany (0.1.1)
234
+ net-scp (3.0.0)
235
+ net-ssh (>= 2.6.5, < 7.0.0)
236
+ net-ssh (6.1.0)
237
+ nio4r (2.5.8)
238
+ nokogiri (1.12.5)
239
+ mini_portile2 (~> 2.6.1)
240
+ racc (~> 1.4)
241
+ notiffany (0.1.3)
206
242
  nenv (~> 0.1)
207
243
  shellany (~> 0.0)
208
- paper_trail (6.0.2)
209
- activerecord (>= 4.0, < 5.2)
244
+ orm_adapter (0.5.0)
245
+ paper_trail (12.0.0)
246
+ activerecord (>= 5.2)
210
247
  request_store (~> 1.1)
211
- paperclip (5.2.1)
248
+ paperclip (6.1.0)
212
249
  activemodel (>= 4.2.0)
213
250
  activesupport (>= 4.2.0)
214
- cocaine (~> 0.5.5)
215
251
  mime-types
216
252
  mimemagic (~> 0.3.0)
217
- parallel (1.12.1)
218
- parser (2.5.0.0)
219
- ast (~> 2.4.0)
220
- pg (0.21.0)
221
- polyamorous (1.3.3)
222
- activerecord (>= 3.0)
223
- powerpack (0.1.1)
224
- premailer (1.11.1)
253
+ terrapin (~> 0.6.0)
254
+ parallel (1.21.0)
255
+ parser (3.0.2.0)
256
+ ast (~> 2.4.1)
257
+ pg (1.2.3)
258
+ popper_js (2.9.3)
259
+ premailer (1.15.0)
225
260
  addressable
226
261
  css_parser (>= 1.6.0)
227
262
  htmlentities (>= 4.0.0)
228
- pry (0.11.3)
229
- coderay (~> 1.1.0)
230
- method_source (~> 0.9.0)
231
- pry-rails (0.3.6)
263
+ pry (0.14.1)
264
+ coderay (~> 1.1)
265
+ method_source (~> 1.0)
266
+ pry-rails (0.3.9)
232
267
  pry (>= 0.10.4)
233
- public_suffix (3.0.2)
234
- puma (3.11.2)
235
- rack (2.0.4)
236
- rack-test (1.0.0)
268
+ public_suffix (4.0.6)
269
+ puma (5.5.0)
270
+ nio4r (~> 2.0)
271
+ racc (1.5.2)
272
+ rack (2.2.3)
273
+ rack-test (1.1.0)
237
274
  rack (>= 1.0, < 3)
238
- rails (5.1.6)
239
- actioncable (= 5.1.6)
240
- actionmailer (= 5.1.6)
241
- actionpack (= 5.1.6)
242
- actionview (= 5.1.6)
243
- activejob (= 5.1.6)
244
- activemodel (= 5.1.6)
245
- activerecord (= 5.1.6)
246
- activesupport (= 5.1.6)
275
+ rails (6.0.4.1)
276
+ actioncable (= 6.0.4.1)
277
+ actionmailbox (= 6.0.4.1)
278
+ actionmailer (= 6.0.4.1)
279
+ actionpack (= 6.0.4.1)
280
+ actiontext (= 6.0.4.1)
281
+ actionview (= 6.0.4.1)
282
+ activejob (= 6.0.4.1)
283
+ activemodel (= 6.0.4.1)
284
+ activerecord (= 6.0.4.1)
285
+ activestorage (= 6.0.4.1)
286
+ activesupport (= 6.0.4.1)
247
287
  bundler (>= 1.3.0)
248
- railties (= 5.1.6)
288
+ railties (= 6.0.4.1)
249
289
  sprockets-rails (>= 2.0.0)
250
- rails-controller-testing (1.0.2)
251
- actionpack (~> 5.x, >= 5.0.1)
252
- actionview (~> 5.x, >= 5.0.1)
253
- activesupport (~> 5.x)
290
+ rails-controller-testing (1.0.5)
291
+ actionpack (>= 5.0.1.rc1)
292
+ actionview (>= 5.0.1.rc1)
293
+ activesupport (>= 5.0.1.rc1)
254
294
  rails-dom-testing (2.0.3)
255
295
  activesupport (>= 4.2.0)
256
296
  nokogiri (>= 1.6)
257
- rails-html-sanitizer (1.0.4)
258
- loofah (~> 2.2, >= 2.2.2)
259
- rails-i18n (5.1.0)
297
+ rails-html-sanitizer (1.4.2)
298
+ loofah (~> 2.3)
299
+ rails-i18n (6.0.0)
260
300
  i18n (>= 0.7, < 2)
261
- railties (>= 5.0, < 6)
301
+ railties (>= 6.0.0, < 7)
262
302
  rails-observers (0.1.5)
263
303
  activemodel (>= 4.0)
264
304
  rails3-jquery-autocomplete (1.0.15)
@@ -270,128 +310,137 @@ GEM
270
310
  rails (> 3.1)
271
311
  rails_serve_static_assets (0.0.5)
272
312
  rails_stdout_logging (0.0.5)
273
- railties (5.1.6)
274
- actionpack (= 5.1.6)
275
- activesupport (= 5.1.6)
313
+ railties (6.0.4.1)
314
+ actionpack (= 6.0.4.1)
315
+ activesupport (= 6.0.4.1)
276
316
  method_source
277
317
  rake (>= 0.8.7)
278
- thor (>= 0.18.1, < 2.0)
318
+ thor (>= 0.20.3, < 2.0)
279
319
  rainbow (3.0.0)
280
- rake (12.3.1)
281
- ransack (1.8.7)
282
- actionpack (>= 3.0)
283
- activerecord (>= 3.0)
284
- activesupport (>= 3.0)
320
+ rake (13.0.6)
321
+ ransack (2.4.2)
322
+ activerecord (>= 5.2.4)
323
+ activesupport (>= 5.2.4)
285
324
  i18n
286
- polyamorous (~> 1.3.2)
287
325
  ransack_chronic (1.1.0)
288
326
  chronic (>= 0.6.7)
289
- ransack_ui (1.3.4)
290
- ransack
327
+ ransack_ui (1.4.0)
328
+ ransack (~> 2.0)
291
329
  ransack_chronic (>= 1.1.0)
292
330
  rb-fchange (0.0.6)
293
331
  ffi
294
- rb-fsevent (0.10.2)
295
- rb-inotify (0.9.10)
296
- ffi (>= 0.5.0, < 2)
297
- ref (2.0.0)
298
- request_store (1.4.0)
332
+ rb-fsevent (0.11.0)
333
+ rb-inotify (0.10.1)
334
+ ffi (~> 1.0)
335
+ regexp_parser (2.1.1)
336
+ request_store (1.5.0)
299
337
  rack (>= 1.4)
300
- responders (2.4.0)
301
- actionpack (>= 4.2.0, < 5.3)
302
- railties (>= 4.2.0, < 5.3)
303
- responds_to_parent (1.1.0)
304
- rspec (3.7.0)
305
- rspec-core (~> 3.7.0)
306
- rspec-expectations (~> 3.7.0)
307
- rspec-mocks (~> 3.7.0)
308
- rspec-activemodel-mocks (1.0.3)
338
+ responders (3.0.1)
339
+ actionpack (>= 5.0)
340
+ railties (>= 5.0)
341
+ rexml (3.2.5)
342
+ rspec (3.10.0)
343
+ rspec-core (~> 3.10.0)
344
+ rspec-expectations (~> 3.10.0)
345
+ rspec-mocks (~> 3.10.0)
346
+ rspec-activemodel-mocks (1.1.0)
309
347
  activemodel (>= 3.0)
310
348
  activesupport (>= 3.0)
311
349
  rspec-mocks (>= 2.99, < 4.0)
312
- rspec-core (3.7.1)
313
- rspec-support (~> 3.7.0)
314
- rspec-expectations (3.7.0)
350
+ rspec-core (3.10.1)
351
+ rspec-support (~> 3.10.0)
352
+ rspec-expectations (3.10.1)
315
353
  diff-lcs (>= 1.2.0, < 2.0)
316
- rspec-support (~> 3.7.0)
317
- rspec-mocks (3.7.0)
354
+ rspec-support (~> 3.10.0)
355
+ rspec-mocks (3.10.2)
318
356
  diff-lcs (>= 1.2.0, < 2.0)
319
- rspec-support (~> 3.7.0)
320
- rspec-rails (3.7.2)
321
- actionpack (>= 3.0)
322
- activesupport (>= 3.0)
323
- railties (>= 3.0)
324
- rspec-core (~> 3.7.0)
325
- rspec-expectations (~> 3.7.0)
326
- rspec-mocks (~> 3.7.0)
327
- rspec-support (~> 3.7.0)
328
- rspec-support (3.7.1)
329
- rubocop (0.52.1)
357
+ rspec-support (~> 3.10.0)
358
+ rspec-rails (5.0.2)
359
+ actionpack (>= 5.2)
360
+ activesupport (>= 5.2)
361
+ railties (>= 5.2)
362
+ rspec-core (~> 3.10)
363
+ rspec-expectations (~> 3.10)
364
+ rspec-mocks (~> 3.10)
365
+ rspec-support (~> 3.10)
366
+ rspec-support (3.10.2)
367
+ rubocop (0.82.0)
368
+ jaro_winkler (~> 1.5.1)
330
369
  parallel (~> 1.10)
331
- parser (>= 2.4.0.2, < 3.0)
332
- powerpack (~> 0.1)
370
+ parser (>= 2.7.0.1)
333
371
  rainbow (>= 2.2.2, < 4.0)
372
+ rexml
334
373
  ruby-progressbar (~> 1.7)
335
- unicode-display_width (~> 1.0, >= 1.0.1)
336
- ruby-progressbar (1.9.0)
337
- ruby_dep (1.5.0)
338
- rubyzip (1.2.1)
339
- sass (3.5.5)
374
+ unicode-display_width (>= 1.4.0, < 2.0)
375
+ ruby-progressbar (1.11.0)
376
+ rubyzip (2.3.2)
377
+ sass (3.7.4)
340
378
  sass-listen (~> 4.0.0)
341
379
  sass-listen (4.0.0)
342
380
  rb-fsevent (~> 0.9, >= 0.9.4)
343
381
  rb-inotify (~> 0.9, >= 0.9.7)
344
- sass-rails (5.0.7)
345
- railties (>= 4.0.0, < 6)
382
+ sass-rails (5.0.8)
383
+ railties (>= 5.2.0)
346
384
  sass (~> 3.1)
347
385
  sprockets (>= 2.8, < 4.0)
348
386
  sprockets-rails (>= 2.0, < 4.0)
349
387
  tilt (>= 1.1, < 3)
350
- scrypt (3.0.5)
351
- ffi-compiler (>= 1.0, < 2.0)
352
- select2-rails (4.0.3)
353
- thor (~> 0.14)
354
- selenium-webdriver (3.9.0)
355
- childprocess (~> 0.5)
356
- rubyzip (~> 1.2)
388
+ sassc (2.4.0)
389
+ ffi (~> 1.9)
390
+ sassc-rails (2.1.2)
391
+ railties (>= 4.0.0)
392
+ sassc (>= 2.0)
393
+ sprockets (> 3.0)
394
+ sprockets-rails
395
+ tilt
396
+ select2-rails (4.0.13)
397
+ selenium-webdriver (3.142.7)
398
+ childprocess (>= 0.5, < 4.0)
399
+ rubyzip (>= 1.2.2)
357
400
  shellany (0.0.1)
358
- simple_form (3.5.1)
359
- actionpack (> 4, < 5.2)
360
- activemodel (> 4, < 5.2)
401
+ simple_form (5.1.0)
402
+ actionpack (>= 5.2)
403
+ activemodel (>= 5.2)
361
404
  sixarm_ruby_unaccent (1.2.0)
362
405
  sort_alphabetical (1.1.0)
363
406
  unicode_utils (>= 1.2.2)
364
- sprockets (3.7.1)
407
+ sprockets (3.7.2)
365
408
  concurrent-ruby (~> 1.0)
366
409
  rack (> 1, < 3)
367
- sprockets-rails (3.2.1)
410
+ sprockets-rails (3.2.2)
368
411
  actionpack (>= 4.0)
369
412
  activesupport (>= 4.0)
370
413
  sprockets (>= 3.0.0)
371
- sqlite3 (1.3.13)
372
- sshkit (1.16.0)
414
+ sqlite3 (1.4.2)
415
+ sshkit (1.21.2)
373
416
  net-scp (>= 1.1.2)
374
417
  net-ssh (>= 2.8.0)
375
- temple (0.8.0)
376
- therubyracer (0.12.3)
377
- libv8 (~> 3.16.14.15)
378
- ref
379
- thor (0.20.0)
418
+ temple (0.8.2)
419
+ terrapin (0.6.0)
420
+ climate_control (>= 0.0.3, < 1.0)
421
+ thor (1.1.0)
380
422
  thread_safe (0.3.6)
381
- tilt (2.0.8)
382
- timecop (0.9.1)
383
- tzinfo (1.2.5)
423
+ tilt (2.0.10)
424
+ timecop (0.9.4)
425
+ tzinfo (1.2.9)
384
426
  thread_safe (~> 0.1)
385
- uglifier (4.1.6)
427
+ uglifier (4.2.0)
386
428
  execjs (>= 0.3.0, < 3)
387
- unicode-display_width (1.3.0)
429
+ unicode-display_width (1.8.0)
388
430
  unicode_utils (1.4.0)
389
- websocket-driver (0.6.5)
431
+ warden (1.2.9)
432
+ rack (>= 2.0.9)
433
+ webdrivers (4.6.1)
434
+ nokogiri (~> 1.6)
435
+ rubyzip (>= 1.3.0)
436
+ selenium-webdriver (>= 3.0, < 4.0)
437
+ websocket-driver (0.7.5)
390
438
  websocket-extensions (>= 0.1.0)
391
- websocket-extensions (0.1.3)
392
- will_paginate (3.1.6)
393
- xpath (3.0.0)
439
+ websocket-extensions (0.1.5)
440
+ will_paginate (3.3.1)
441
+ xpath (3.2.0)
394
442
  nokogiri (~> 1.8)
443
+ zeitwerk (2.4.2)
395
444
  zeus (0.15.14)
396
445
  method_source (>= 0.6.7)
397
446
 
@@ -399,31 +448,32 @@ PLATFORMS
399
448
  ruby
400
449
 
401
450
  DEPENDENCIES
451
+ activejob
402
452
  activemodel-serializers-xml
403
453
  acts-as-taggable-on (>= 3.4.3)
404
- acts_as_commentable
405
- acts_as_fu
454
+ acts_as_commentable!
406
455
  acts_as_list
407
- authlogic (>= 3.4.4)
408
456
  bootsnap
457
+ bootstrap (= 5.0.0)
409
458
  brakeman
410
459
  byebug
411
- cancancan
460
+ cancancan (~> 3.0.0)
412
461
  capistrano
413
462
  capistrano-bundler
414
463
  capistrano-rails
415
464
  capistrano-rvm
416
465
  capybara
417
- chromedriver-helper
418
- cocaine
419
466
  coffee-rails
420
467
  coffee-script-source (~> 1.8, >= 1.8.0)
421
468
  country_select
422
469
  database_cleaner
470
+ devise (~> 4.6)
471
+ devise-encryptable
472
+ devise-i18n
423
473
  dynamic_form
424
474
  email_reply_parser_ffcrm
425
475
  execjs
426
- factory_bot_rails
476
+ factory_bot_rails (~> 5.0)
427
477
  ffaker (>= 2)
428
478
  font-awesome-rails
429
479
  guard
@@ -434,14 +484,15 @@ DEPENDENCIES
434
484
  jquery-migrate-rails
435
485
  jquery-rails
436
486
  jquery-ui-rails
487
+ mini_racer
437
488
  nokogiri (>= 1.8.1)
438
- paper_trail (~> 6.0.0)
489
+ paper_trail (~> 12.0.0)
439
490
  paperclip
440
- pg (~> 0.21.0)
491
+ pg
441
492
  premailer
442
493
  pry-rails
443
494
  puma
444
- rails (~> 5.1.0)
495
+ rails (~> 6.0.0)
445
496
  rails-controller-testing
446
497
  rails-i18n
447
498
  rails-observers
@@ -449,29 +500,30 @@ DEPENDENCIES
449
500
  rails_12factor
450
501
  rails_autolink
451
502
  rainbow
452
- ransack (~> 1.7, >= 1.6.2)
453
- ransack_ui (~> 1.3, >= 1.3.1)
503
+ ransack (>= 1.6.2)
504
+ ransack_ui
454
505
  rb-fchange
455
506
  rb-fsevent
456
507
  rb-inotify
457
- responders (~> 2.0)
458
- responds_to_parent
508
+ responders (~> 3.0)
509
+ responds_to_parent!
459
510
  rspec-activemodel-mocks
460
511
  rspec-rails
461
- rubocop (~> 0.52.0)
512
+ rubocop (~> 0.82.0)
462
513
  sass
463
- sass-rails
514
+ sass-rails (~> 5.0.3)
464
515
  select2-rails
465
516
  selenium-webdriver
466
517
  simple_form
467
518
  sprockets-rails (>= 3.0.0)
468
- therubyracer
519
+ sqlite3 (~> 1.4.0)
469
520
  thor
470
521
  timecop
471
522
  tzinfo-data
472
523
  uglifier
524
+ webdrivers
473
525
  will_paginate
474
526
  zeus
475
527
 
476
528
  BUNDLED WITH
477
- 1.16.1
529
+ 2.2.17