fat_free_crm 0.18.2 → 0.19.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 (251) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop_todo.yml +61 -160
  3. data/.travis.yml +27 -11
  4. data/CHANGELOG.md +40 -24
  5. data/CONTRIBUTORS.md +1 -0
  6. data/Dockerfile +45 -14
  7. data/Gemfile +16 -10
  8. data/Gemfile.lock +230 -222
  9. data/Procfile +1 -1
  10. data/README.md +2 -2
  11. data/Rakefile +1 -1
  12. data/app/assets/stylesheets/common.scss +1 -1
  13. data/app/controllers/admin/application_controller.rb +1 -1
  14. data/app/controllers/admin/field_groups_controller.rb +1 -3
  15. data/app/controllers/admin/tags_controller.rb +1 -3
  16. data/app/controllers/admin/users_controller.rb +5 -8
  17. data/app/controllers/application_controller.rb +11 -45
  18. data/app/controllers/comments_controller.rb +2 -5
  19. data/{config/initializers/authlogic.rb → app/controllers/confirmations_controller.rb} +4 -2
  20. data/app/controllers/emails_controller.rb +0 -2
  21. data/app/controllers/entities/accounts_controller.rb +1 -3
  22. data/app/controllers/entities/campaigns_controller.rb +1 -3
  23. data/app/controllers/entities/contacts_controller.rb +4 -24
  24. data/app/controllers/entities/leads_controller.rb +7 -10
  25. data/app/controllers/entities/opportunities_controller.rb +4 -14
  26. data/app/controllers/entities_controller.rb +21 -7
  27. data/app/controllers/home_controller.rb +2 -4
  28. data/app/controllers/passwords_controller.rb +3 -59
  29. data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb} +12 -5
  30. data/{lib/development_tasks/gem.rake → app/controllers/sessions_controller.rb} +6 -6
  31. data/app/controllers/tasks_controller.rb +8 -17
  32. data/app/controllers/users_controller.rb +8 -29
  33. data/app/helpers/admin/users_helper.rb +1 -1
  34. data/app/helpers/application_helper.rb +27 -32
  35. data/app/helpers/campaigns_helper.rb +1 -1
  36. data/app/helpers/contacts_helper.rb +1 -3
  37. data/app/helpers/opportunities_helper.rb +4 -12
  38. data/app/helpers/tasks_helper.rb +1 -1
  39. data/app/helpers/users_helper.rb +1 -3
  40. data/{config/initializers/paper_trail.rb → app/mailers/devise_mailer.rb} +5 -1
  41. data/app/mailers/user_mailer.rb +0 -9
  42. data/app/models/entities/account.rb +10 -10
  43. data/app/models/entities/campaign.rb +4 -6
  44. data/app/models/entities/contact.rb +24 -12
  45. data/app/models/entities/lead.rb +7 -7
  46. data/app/models/entities/opportunity.rb +7 -9
  47. data/app/models/fields/custom_field.rb +1 -0
  48. data/app/models/fields/custom_field_date_pair.rb +2 -0
  49. data/app/models/fields/field.rb +1 -3
  50. data/app/models/list.rb +1 -1
  51. data/app/models/observers/entity_observer.rb +3 -7
  52. data/app/models/observers/lead_observer.rb +2 -4
  53. data/app/models/observers/opportunity_observer.rb +2 -4
  54. data/app/models/observers/task_observer.rb +1 -1
  55. data/app/models/polymorphic/email.rb +2 -2
  56. data/app/models/polymorphic/task.rb +13 -9
  57. data/app/models/polymorphic/version.rb +3 -2
  58. data/app/models/setting.rb +2 -0
  59. data/app/models/users/permission.rb +3 -3
  60. data/app/models/users/preference.rb +2 -1
  61. data/app/models/users/user.rb +67 -42
  62. data/app/views/accounts/_top_section.html.haml +1 -1
  63. data/app/views/accounts/edit.js.haml +1 -1
  64. data/app/views/accounts/update.js.haml +2 -2
  65. data/app/views/admin/users/_user.html.haml +4 -4
  66. data/app/views/contacts/_index_brief.html.haml +1 -1
  67. data/app/views/contacts/_index_full.html.haml +1 -1
  68. data/app/views/contacts/_index_long.html.haml +1 -1
  69. data/app/views/devise/confirmations/new.html.haml +9 -0
  70. data/app/views/devise/mailer/confirmation_instructions.html.haml +4 -0
  71. data/app/views/devise/mailer/password_change.html.haml +3 -0
  72. data/app/views/devise/mailer/reset_password_instructions.html.haml +6 -0
  73. data/app/views/devise/passwords/edit.html.haml +18 -0
  74. data/app/views/devise/passwords/new.html.haml +10 -0
  75. data/app/views/devise/registrations/new.html.haml +21 -0
  76. data/app/views/devise/sessions/new.html.haml +32 -0
  77. data/app/views/layouts/_about.html.haml +5 -5
  78. data/app/views/layouts/_header.html.haml +3 -3
  79. data/app/views/layouts/admin/_header.html.haml +1 -1
  80. data/app/views/shared/_address.html.haml +5 -5
  81. data/app/views/shared/_paginate_with_per_page.html.haml +1 -0
  82. data/app/views/users/_avatar.html.haml +1 -1
  83. data/bin/bundle +1 -1
  84. data/bin/rails +1 -1
  85. data/bin/setup +38 -0
  86. data/bin/update +33 -0
  87. data/bin/yarn +13 -0
  88. data/config/application.rb +8 -6
  89. data/config/boot.rb +1 -1
  90. data/config/brakeman.ignore +2 -2
  91. data/config/database.postgres.docker.yml +5 -5
  92. data/config/environment.rb +1 -1
  93. data/config/environments/development.rb +1 -0
  94. data/config/environments/test.rb +7 -0
  95. data/config/initializers/action_mailer.rb +1 -3
  96. data/config/initializers/application_controller_renderer.rb +9 -0
  97. data/config/initializers/assets.rb +6 -11
  98. data/config/initializers/backtrace_silencers.rb +0 -6
  99. data/config/initializers/content_security_policy.rb +26 -0
  100. data/config/initializers/cookies_serializer.rb +3 -6
  101. data/config/initializers/devise.rb +289 -0
  102. data/config/initializers/filter_parameter_logging.rb +0 -5
  103. data/config/initializers/gravatar.rb +0 -1
  104. data/config/initializers/inflections.rb +0 -6
  105. data/config/initializers/mime_types.rb +1 -9
  106. data/config/initializers/new_framework_defaults_5_2.rb +40 -0
  107. data/config/initializers/relative_url_root.rb +1 -3
  108. data/config/initializers/session_store.rb +1 -3
  109. data/config/initializers/wrap_parameters.rb +4 -9
  110. data/config/locales/fat_free_crm.en-GB.yml +5 -5
  111. data/config/locales/fat_free_crm.en-US.yml +5 -5
  112. data/config/locales/fat_free_crm.fr.yml +1 -1
  113. data/config/locales/fat_free_crm.ru.yml +1 -0
  114. data/config/routes.rb +20 -9
  115. data/db/demo/users.yml +62 -81
  116. data/db/migrate/20100928030620_remove_uuid.rb +1 -2
  117. data/db/migrate/20120316045804_activities_to_versions.rb +1 -0
  118. data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +1 -0
  119. data/db/migrate/20180107082701_authlogic_to_devise.rb +58 -0
  120. data/db/schema.rb +48 -43
  121. data/docker-compose.yml +10 -0
  122. data/fat_free_crm.gemspec +11 -13
  123. data/lib/development_tasks/license.rake +2 -2
  124. data/lib/fat_free_crm/callback.rb +2 -2
  125. data/lib/fat_free_crm/comment_extensions.rb +2 -4
  126. data/lib/fat_free_crm/core_ext/string.rb +1 -1
  127. data/lib/fat_free_crm/engine.rb +1 -1
  128. data/lib/fat_free_crm/errors.rb +1 -1
  129. data/lib/fat_free_crm/export_csv.rb +1 -0
  130. data/lib/fat_free_crm/exportable.rb +1 -1
  131. data/lib/fat_free_crm/fields.rb +1 -1
  132. data/lib/fat_free_crm/gem_dependencies.rb +1 -1
  133. data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +1 -3
  134. data/lib/fat_free_crm/i18n.rb +2 -2
  135. data/lib/fat_free_crm/mail_processor/base.rb +4 -10
  136. data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -15
  137. data/lib/fat_free_crm/permissions.rb +7 -4
  138. data/lib/fat_free_crm/sortable.rb +1 -1
  139. data/lib/fat_free_crm/tabs.rb +2 -2
  140. data/lib/fat_free_crm/version.rb +2 -2
  141. data/lib/gravatar_image_tag.rb +7 -8
  142. data/lib/missing_translation_detector.rb +1 -0
  143. data/lib/tasks/ffcrm/missing_translations.rake +1 -0
  144. data/lib/tasks/ffcrm/setup.rake +10 -1
  145. data/lib/tasks/ffcrm/update_data.rake +2 -2
  146. data/script/rails +2 -2
  147. data/spec/controllers/admin/users_controller_spec.rb +0 -56
  148. data/spec/controllers/comments_controller_spec.rb +6 -6
  149. data/spec/controllers/entities/campaigns_controller_spec.rb +1 -1
  150. data/spec/controllers/entities/contacts_controller_spec.rb +2 -1
  151. data/spec/controllers/entities/leads_controller_spec.rb +2 -2
  152. data/spec/controllers/entities/opportunities_controller_spec.rb +1 -1
  153. data/spec/controllers/entities_controller_spec.rb +5 -0
  154. data/spec/controllers/home_controller_spec.rb +5 -5
  155. data/spec/controllers/tasks_controller_spec.rb +6 -4
  156. data/spec/controllers/users_controller_spec.rb +28 -98
  157. data/spec/factories/account_factories.rb +5 -5
  158. data/spec/factories/campaign_factories.rb +3 -3
  159. data/spec/factories/contact_factories.rb +8 -8
  160. data/spec/factories/field_factories.rb +4 -3
  161. data/spec/factories/lead_factories.rb +5 -5
  162. data/spec/factories/list_factories.rb +2 -2
  163. data/spec/factories/opportunity_factories.rb +3 -3
  164. data/spec/factories/setting_factories.rb +2 -2
  165. data/spec/factories/shared_factories.rb +11 -9
  166. data/spec/factories/task_factories.rb +7 -7
  167. data/spec/factories/user_factories.rb +16 -19
  168. data/spec/features/admin/groups_spec.rb +1 -1
  169. data/spec/features/admin/users_spec.rb +3 -1
  170. data/spec/features/campaigns_spec.rb +1 -1
  171. data/spec/features/contacts_spec.rb +1 -1
  172. data/spec/features/dashboard_spec.rb +1 -1
  173. data/spec/features/devise/sign_in_spec.rb +58 -0
  174. data/spec/features/devise/sign_up_spec.rb +36 -0
  175. data/spec/features/leads_spec.rb +1 -1
  176. data/spec/features/opportunities_overview_spec.rb +1 -1
  177. data/spec/features/opportunities_spec.rb +3 -3
  178. data/spec/features/support/browser.rb +2 -1
  179. data/spec/features/tasks_spec.rb +1 -1
  180. data/spec/helpers/admin/field_groups_helper_spec.rb +1 -1
  181. data/spec/helpers/users_helper_spec.rb +4 -4
  182. data/spec/lib/comment_extensions_spec.rb +10 -4
  183. data/spec/lib/errors_spec.rb +2 -2
  184. data/spec/lib/mail_processor/dropbox_spec.rb +1 -1
  185. data/spec/lib/mail_processor/sample_emails/dropbox.rb +8 -8
  186. data/spec/lib/permissions_spec.rb +8 -3
  187. data/spec/mailers/devise_mailer_spec.rb +35 -0
  188. data/spec/mailers/user_mailer_spec.rb +0 -26
  189. data/spec/models/entities/account_spec.rb +27 -0
  190. data/spec/models/entities/contact_spec.rb +96 -1
  191. data/spec/models/fields/custom_field_date_pair_spec.rb +4 -2
  192. data/spec/models/fields/custom_field_spec.rb +4 -2
  193. data/spec/models/observers/entity_observer_spec.rb +1 -1
  194. data/spec/models/polymorphic/version_spec.rb +7 -7
  195. data/spec/models/users/user_spec.rb +22 -26
  196. data/spec/routing/users_routing_spec.rb +30 -8
  197. data/spec/shared/controllers.rb +3 -9
  198. data/spec/spec_helper.rb +10 -2
  199. data/spec/support/assert_select.rb +1 -0
  200. data/spec/support/devise_helpers.rb +28 -0
  201. data/spec/{features/support/helpers.rb → support/feature_helpers.rb} +10 -10
  202. data/spec/support/macros.rb +4 -1
  203. data/spec/views/contacts/update.js.haml_spec.rb +1 -1
  204. data/spec/views/opportunities/update.js.haml_spec.rb +1 -1
  205. data/vendor/gems/ransack_ui-1.3.4/.gitignore +17 -0
  206. data/vendor/gems/ransack_ui-1.3.4/Gemfile +7 -0
  207. data/vendor/gems/ransack_ui-1.3.4/LICENSE.txt +22 -0
  208. data/vendor/gems/ransack_ui-1.3.4/README.md +57 -0
  209. data/vendor/gems/ransack_ui-1.3.4/Rakefile +1 -0
  210. data/vendor/gems/ransack_ui-1.3.4/app/assets/images/ransack_ui/calendar.png +0 -0
  211. data/vendor/gems/ransack_ui-1.3.4/app/assets/images/ransack_ui/delete.png +0 -0
  212. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack/predicates.js.coffee +41 -0
  213. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_bootstrap/button_group_select.js.coffee +26 -0
  214. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_bootstrap/index.js.coffee +2 -0
  215. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_jquery/index.js +2 -0
  216. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb +499 -0
  217. data/vendor/gems/ransack_ui-1.3.4/app/assets/stylesheets/ransack_ui_bootstrap/index.css +3 -0
  218. data/vendor/gems/ransack_ui-1.3.4/app/assets/stylesheets/ransack_ui_bootstrap/search.css.scss +41 -0
  219. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_condition_fields.html.erb +15 -0
  220. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_grouping_fields.html.erb +16 -0
  221. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_search.html.erb +29 -0
  222. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_sort_fields.html.erb +4 -0
  223. data/vendor/gems/ransack_ui-1.3.4/config/locales/en.yml +24 -0
  224. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui.rb +9 -0
  225. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/adapters/active_record.rb +6 -0
  226. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/adapters/active_record/base.rb +46 -0
  227. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/controller_helpers.rb +18 -0
  228. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/rails/engine.rb +21 -0
  229. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb +47 -0
  230. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/configuration.rb +15 -0
  231. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/context.rb +9 -0
  232. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/helpers/form_builder.rb +262 -0
  233. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/nodes/attribute.rb +13 -0
  234. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/nodes/condition.rb +13 -0
  235. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/nodes/grouping.rb +20 -0
  236. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/version.rb +3 -0
  237. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/view_helpers.rb +30 -0
  238. data/vendor/gems/ransack_ui-1.3.4/ransack_ui.gemspec +23 -0
  239. metadata +79 -67
  240. data/app/controllers/authentications_controller.rb +0 -53
  241. data/app/models/users/authentication.rb +0 -56
  242. data/app/views/authentications/new.html.haml +0 -19
  243. data/app/views/passwords/edit.html.haml +0 -15
  244. data/app/views/passwords/new.html.haml +0 -10
  245. data/app/views/user_mailer/password_reset_instructions.html.haml +0 -6
  246. data/app/views/users/new.html.haml +0 -19
  247. data/spec/controllers/authentications_controller_spec.rb +0 -150
  248. data/spec/controllers/passwords_controller_spec.rb +0 -32
  249. data/spec/models/users/authentication_spec.rb +0 -19
  250. data/spec/support/auth_macros.rb +0 -49
  251. data/spec/views/authentications/new.haml_spec.rb +0 -31
data/CONTRIBUTORS.md CHANGED
@@ -11,6 +11,7 @@ translations to the Fat Free CRM:
11
11
  * Alex Tomlins
12
12
  * AndrewsHerrera
13
13
  * Anton Oslyak
14
+ * Antonin Steinhauser
14
15
  * Apirak
15
16
  * Apirak Panatkool
16
17
  * Ashwin Phatak
data/Dockerfile CHANGED
@@ -1,20 +1,51 @@
1
1
  # Usage:
2
+ # docker volume create pgdata
3
+ # docker volume create gems
2
4
  # docker-compose up
3
- # docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load assets:precompile
5
+ # docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load
4
6
 
5
- FROM phusion/passenger-ruby24
6
- MAINTAINER Steve Kenworthy
7
+ FROM ruby:2.4
8
+
9
+ LABEL author="Steve Kenworthy"
7
10
 
8
11
  ENV HOME /home/app
9
12
 
10
- ADD . /home/app
11
- WORKDIR /home/app
12
-
13
- RUN apt-get update \
14
- && apt-get install -y imagemagick firefox \
15
- && apt-get autoremove -y \
16
- && cp config/database.postgres.docker.yml config/database.yml \
17
- && chown -R app:app /home/app \
18
- && rm -f /etc/service/nginx/down /etc/nginx/sites-enabled/default \
19
- && cp .docker/nginx/sites-enabled/ffcrm.conf /etc/nginx/sites-enabled/ffcrm.conf \
20
- && bundle install --deployment
13
+ RUN mkdir -p $HOME
14
+
15
+ WORKDIR $HOME
16
+
17
+ ADD . $HOME
18
+ RUN apt-get update && \
19
+ apt-get install -y imagemagick tzdata && \
20
+ apt-get autoremove -y && \
21
+ cp config/database.postgres.docker.yml config/database.yml && \
22
+ gem install bundler && \
23
+ bundle install --deployment && \
24
+ bundle exec rails assets:precompile
25
+
26
+ CMD ["bundle","exec","rails","s"]
27
+
28
+ EXPOSE 3000
29
+
30
+ # # Usage:
31
+ # # docker volume create pgdata
32
+ # # docker volume create gems
33
+ # # docker-compose up
34
+ # # docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load assets:precompile
35
+
36
+ # FROM phusion/passenger-ruby24
37
+ # MAINTAINER Steve Kenworthy
38
+
39
+ # ENV HOME /home/app
40
+
41
+ # ADD . /home/app
42
+ # WORKDIR /home/app
43
+
44
+ # RUN apt-get update \
45
+ # && apt-get install -y imagemagick firefox tzdata \
46
+ # && apt-get autoremove -y \
47
+ # && cp config/database.postgres.docker.yml config/database.yml \
48
+ # && chown -R app:app /home/app \
49
+ # && rm -f /etc/service/nginx/down /etc/nginx/sites-enabled/default \
50
+ # && cp .docker/nginx/sites-enabled/ffcrm.conf /etc/nginx/sites-enabled/ffcrm.conf \
51
+ # && bundle install --deployment
data/Gemfile CHANGED
@@ -7,13 +7,13 @@ source 'https://rubygems.org'
7
7
 
8
8
  case ENV['CI'] && ENV['DB']
9
9
  when 'sqlite'
10
- gem 'sqlite3'
10
+ gem 'sqlite3', '~> 1.3.13'
11
11
  when 'mysql'
12
12
  gem 'mysql2'
13
13
  when 'postgres'
14
- gem 'pg', '~> 0.21.0' # Pinned, see https://github.com/fatfreecrm/fat_free_crm/pull/689
14
+ gem 'pg'
15
15
  else
16
- gem 'pg', '~> 0.21.0'
16
+ gem 'pg'
17
17
  end
18
18
 
19
19
  # Removes a gem dependency
@@ -30,7 +30,7 @@ end
30
30
  # Bundler no longer treats runtime dependencies as base dependencies.
31
31
  # The following code restores this behaviour.
32
32
  # (See https://github.com/carlhuda/bundler/issues/1041)
33
- spec = Bundler.load_gemspec(File.expand_path("../fat_free_crm.gemspec", __FILE__))
33
+ spec = Bundler.load_gemspec(File.expand_path('fat_free_crm.gemspec', __dir__))
34
34
  spec.runtime_dependencies.each do |dep|
35
35
  gem dep.name, *dep.requirement.as_list
36
36
  end
@@ -44,7 +44,6 @@ remove 'fat_free_crm'
44
44
  group :development do
45
45
  # don't load these gems in travis
46
46
  unless ENV["CI"]
47
- gem 'puma'
48
47
  gem 'capistrano'
49
48
  gem 'capistrano-bundler'
50
49
  gem 'capistrano-rails'
@@ -66,26 +65,28 @@ group :development, :test do
66
65
  gem 'headless'
67
66
  gem 'byebug'
68
67
  gem 'pry-rails' unless ENV["CI"]
69
- gem 'factory_bot_rails'
70
- gem 'rubocop', '~> 0.52.0' # Pinned because upgrades require regenerating rubocop_todo.yml
68
+ gem 'factory_bot_rails', '~> 5.0' # Was Pinned due to minor failing view tests to 4.0
69
+ gem 'rubocop', '~> 0.76.0' # Pinned because upgrades require regenerating rubocop_todo.yml
71
70
  gem 'rainbow'
71
+ gem 'puma' # used by capybara 3
72
72
  end
73
73
 
74
74
  group :test do
75
75
  gem 'capybara'
76
76
  gem 'selenium-webdriver'
77
- gem 'chromedriver-helper'
77
+ gem 'webdrivers'
78
78
  gem 'database_cleaner'
79
- gem 'acts_as_fu'
80
79
  gem 'zeus', platform: :ruby unless ENV["CI"]
81
80
  gem 'timecop'
81
+ gem 'sqlite3', '~> 1.3.13'
82
82
  end
83
83
 
84
84
  group :heroku do
85
85
  gem 'rails_12factor'
86
+ gem 'puma'
86
87
  end
87
88
 
88
- gem 'sass-rails'
89
+ gem 'sass-rails', '~> 5.0.3' # sass-rails 6 requires GCC 4.5+
89
90
  gem 'coffee-rails'
90
91
  gem 'uglifier'
91
92
  gem 'execjs'
@@ -93,4 +94,9 @@ gem 'therubyracer', platform: :ruby unless ENV["CI"]
93
94
  gem 'nokogiri', '>= 1.8.1'
94
95
  gem 'activemodel-serializers-xml'
95
96
  gem 'bootsnap', require: false
97
+ gem 'devise', '~>4.6'
98
+ gem 'devise-i18n'
99
+ gem "devise-encryptable"
96
100
  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
101
+ gem 'activejob', '~> 5.2.0'
102
+ gem 'ransack_ui', path: 'vendor/gems/ransack_ui-1.3.4' # Vendored until our fix is merged and released
data/Gemfile.lock CHANGED
@@ -1,146 +1,148 @@
1
+ PATH
2
+ remote: vendor/gems/ransack_ui-1.3.4
3
+ specs:
4
+ ransack_ui (1.3.4)
5
+ ransack
6
+ ransack_chronic (>= 1.1.0)
7
+
1
8
  GEM
2
9
  remote: https://rubygems.org/
3
10
  specs:
4
- actioncable (5.1.7)
5
- actionpack (= 5.1.7)
11
+ actioncable (5.2.4.3)
12
+ actionpack (= 5.2.4.3)
6
13
  nio4r (~> 2.0)
7
- websocket-driver (~> 0.6.1)
8
- actionmailer (5.1.7)
9
- actionpack (= 5.1.7)
10
- actionview (= 5.1.7)
11
- activejob (= 5.1.7)
14
+ websocket-driver (>= 0.6.1)
15
+ actionmailer (5.2.4.3)
16
+ actionpack (= 5.2.4.3)
17
+ actionview (= 5.2.4.3)
18
+ activejob (= 5.2.4.3)
12
19
  mail (~> 2.5, >= 2.5.4)
13
20
  rails-dom-testing (~> 2.0)
14
- actionpack (5.1.7)
15
- actionview (= 5.1.7)
16
- activesupport (= 5.1.7)
17
- rack (~> 2.0)
21
+ actionpack (5.2.4.3)
22
+ actionview (= 5.2.4.3)
23
+ activesupport (= 5.2.4.3)
24
+ rack (~> 2.0, >= 2.0.8)
18
25
  rack-test (>= 0.6.3)
19
26
  rails-dom-testing (~> 2.0)
20
27
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
21
- actionview (5.1.7)
22
- activesupport (= 5.1.7)
28
+ actionview (5.2.4.3)
29
+ activesupport (= 5.2.4.3)
23
30
  builder (~> 3.1)
24
31
  erubi (~> 1.4)
25
32
  rails-dom-testing (~> 2.0)
26
33
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
27
- activejob (5.1.7)
28
- activesupport (= 5.1.7)
34
+ activejob (5.2.4.3)
35
+ activesupport (= 5.2.4.3)
29
36
  globalid (>= 0.3.6)
30
- activemodel (5.1.7)
31
- activesupport (= 5.1.7)
37
+ activemodel (5.2.4.3)
38
+ activesupport (= 5.2.4.3)
32
39
  activemodel-serializers-xml (1.0.2)
33
40
  activemodel (> 5.x)
34
41
  activesupport (> 5.x)
35
42
  builder (~> 3.1)
36
- activerecord (5.1.7)
37
- activemodel (= 5.1.7)
38
- activesupport (= 5.1.7)
39
- arel (~> 8.0)
40
- activesupport (5.1.7)
43
+ activerecord (5.2.4.3)
44
+ activemodel (= 5.2.4.3)
45
+ activesupport (= 5.2.4.3)
46
+ arel (>= 9.0)
47
+ activestorage (5.2.4.3)
48
+ actionpack (= 5.2.4.3)
49
+ activerecord (= 5.2.4.3)
50
+ marcel (~> 0.3.1)
51
+ activesupport (5.2.4.3)
41
52
  concurrent-ruby (~> 1.0, >= 1.0.2)
42
53
  i18n (>= 0.7, < 2)
43
54
  minitest (~> 5.1)
44
55
  tzinfo (~> 1.1)
45
- acts-as-taggable-on (5.0.0)
46
- activerecord (>= 4.2.8)
56
+ acts-as-taggable-on (6.5.0)
57
+ activerecord (>= 5.0, < 6.1)
47
58
  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)
59
+ acts_as_list (1.0.1)
60
+ activerecord (>= 4.2)
61
+ addressable (2.7.0)
62
+ public_suffix (>= 2.0.2, < 5.0)
63
+ airbrussh (1.4.0)
56
64
  sshkit (>= 1.6.1, != 1.7.0)
57
- archive-zip (0.11.0)
58
- io-like (~> 0.3.0)
59
- arel (8.0.0)
65
+ arel (9.0.0)
60
66
  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)
67
+ bcrypt (3.1.13)
68
+ bootsnap (1.4.6)
67
69
  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)
70
+ brakeman (4.8.2)
71
+ builder (3.2.4)
72
+ byebug (11.1.3)
73
+ cancancan (3.0.2)
74
+ capistrano (3.14.0)
73
75
  airbrussh (>= 1.0.0)
74
76
  i18n
75
77
  rake (>= 10.0.0)
76
78
  sshkit (>= 1.9.0)
77
- capistrano-bundler (1.3.0)
79
+ capistrano-bundler (1.6.0)
78
80
  capistrano (~> 3.1)
79
- sshkit (~> 1.2)
80
- capistrano-rails (1.3.1)
81
+ capistrano-rails (1.5.0)
81
82
  capistrano (~> 3.1)
82
83
  capistrano-bundler (~> 1.1)
83
84
  capistrano-rvm (0.1.2)
84
85
  capistrano (~> 3.0)
85
86
  sshkit (~> 1.2)
86
- capybara (2.18.0)
87
+ capybara (3.32.2)
87
88
  addressable
88
89
  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
90
  nokogiri (~> 1.8)
91
+ rack (>= 1.6.0)
92
+ rack-test (>= 0.6.3)
93
+ regexp_parser (~> 1.5)
94
+ xpath (~> 3.2)
95
+ childprocess (3.0.0)
98
96
  chronic (0.10.2)
99
97
  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)
98
+ coderay (1.1.3)
99
+ coffee-rails (5.0.0)
104
100
  coffee-script (>= 2.2.0)
105
- railties (>= 4.0.0)
101
+ railties (>= 5.2.0)
106
102
  coffee-script (2.4.1)
107
103
  coffee-script-source
108
104
  execjs
109
105
  coffee-script-source (1.12.2)
110
- concurrent-ruby (1.1.5)
111
- countries (2.1.4)
112
- i18n_data (~> 0.8.0)
113
- money (~> 6.9)
106
+ concurrent-ruby (1.1.6)
107
+ countries (3.0.1)
108
+ i18n_data (~> 0.10.0)
114
109
  sixarm_ruby_unaccent (~> 1.1)
115
110
  unicode_utils (~> 1.4)
116
- country_select (3.1.1)
117
- countries (~> 2.0)
111
+ country_select (4.0.0)
112
+ countries (~> 3.0)
118
113
  sort_alphabetical (~> 1.0)
119
- crass (1.0.5)
120
- css_parser (1.6.0)
114
+ crass (1.0.6)
115
+ css_parser (1.7.1)
121
116
  addressable
122
- database_cleaner (1.6.2)
117
+ database_cleaner (1.8.5)
118
+ devise (4.7.1)
119
+ bcrypt (~> 3.0)
120
+ orm_adapter (~> 0.1)
121
+ railties (>= 4.1.0)
122
+ responders
123
+ warden (~> 1.2.3)
124
+ devise-encryptable (0.2.0)
125
+ devise (>= 2.1.0)
126
+ devise-i18n (1.9.1)
127
+ devise (>= 4.7.1)
123
128
  diff-lcs (1.3)
124
129
  dynamic_form (1.1.4)
125
130
  email_reply_parser_ffcrm (0.5.0)
126
131
  erubi (1.9.0)
127
132
  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.11.1)
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)
133
+ factory_bot (5.2.0)
134
+ activesupport (>= 4.2.0)
135
+ factory_bot_rails (5.2.0)
136
+ factory_bot (~> 5.2.0)
137
+ railties (>= 4.2.0)
138
+ ffaker (2.15.0)
139
+ ffi (1.13.0)
140
+ font-awesome-rails (4.7.0.5)
141
+ railties (>= 3.2, < 6.1)
140
142
  formatador (0.2.5)
141
143
  globalid (0.4.2)
142
144
  activesupport (>= 4.2.0)
143
- guard (2.14.2)
145
+ guard (2.16.2)
144
146
  formatador (>= 0.2.4)
145
147
  listen (>= 2.7, < 4.0)
146
148
  lumberjack (>= 1.0.12, < 2.0)
@@ -157,106 +159,107 @@ GEM
157
159
  guard (~> 2.1)
158
160
  guard-compat (~> 1.1)
159
161
  rspec (>= 2.99.0, < 4.0)
160
- haml (5.0.4)
162
+ haml (5.1.2)
161
163
  temple (>= 0.8.0)
162
164
  tilt
163
165
  headless (2.3.1)
164
166
  htmlentities (4.3.4)
165
- i18n (0.9.5)
167
+ i18n (1.8.2)
166
168
  concurrent-ruby (~> 1.0)
167
- i18n_data (0.8.0)
168
- io-like (0.3.0)
169
+ i18n_data (0.10.0)
170
+ jaro_winkler (1.5.4)
169
171
  jquery-migrate-rails (1.2.1)
170
- jquery-rails (4.3.1)
172
+ jquery-rails (4.4.0)
171
173
  rails-dom-testing (>= 1, < 3)
172
174
  railties (>= 4.2.0)
173
175
  thor (>= 0.14, < 2.0)
174
176
  jquery-ui-rails (6.0.1)
175
177
  railties (>= 3.2.16)
176
178
  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.3.1)
179
+ listen (3.2.1)
180
+ rb-fsevent (~> 0.10, >= 0.10.3)
181
+ rb-inotify (~> 0.9, >= 0.9.10)
182
+ loofah (2.5.0)
182
183
  crass (~> 1.0.2)
183
184
  nokogiri (>= 1.5.9)
184
- lumberjack (1.0.12)
185
+ lumberjack (1.2.5)
185
186
  mail (2.7.1)
186
187
  mini_mime (>= 0.1.1)
187
- method_source (0.9.2)
188
- mime-types (3.1)
188
+ marcel (0.3.3)
189
+ mimemagic (~> 0.3.2)
190
+ method_source (1.0.0)
191
+ mime-types (3.3.1)
189
192
  mime-types-data (~> 3.2015)
190
- mime-types-data (3.2016.0521)
191
- mimemagic (0.3.2)
193
+ mime-types-data (3.2020.0512)
194
+ mimemagic (0.3.5)
192
195
  mini_mime (1.0.2)
193
196
  mini_portile2 (2.4.0)
194
- minitest (5.13.0)
195
- money (6.10.1)
196
- i18n (>= 0.6.4, < 1.0)
197
- msgpack (1.2.2)
197
+ minitest (5.14.1)
198
+ msgpack (1.3.3)
198
199
  nenv (0.3.0)
199
- net-scp (1.2.1)
200
- net-ssh (>= 2.6.5)
201
- net-ssh (4.2.0)
200
+ net-scp (3.0.0)
201
+ net-ssh (>= 2.6.5, < 7.0.0)
202
+ net-ssh (6.0.2)
202
203
  nio4r (2.5.2)
203
- nokogiri (1.10.5)
204
+ nokogiri (1.10.9)
204
205
  mini_portile2 (~> 2.4.0)
205
- notiffany (0.1.1)
206
+ notiffany (0.1.3)
206
207
  nenv (~> 0.1)
207
208
  shellany (~> 0.0)
208
- paper_trail (6.0.2)
209
- activerecord (>= 4.0, < 5.2)
209
+ orm_adapter (0.5.0)
210
+ paper_trail (10.0.1)
211
+ activerecord (>= 4.2, < 5.3)
210
212
  request_store (~> 1.1)
211
- paperclip (5.2.1)
213
+ paperclip (6.1.0)
212
214
  activemodel (>= 4.2.0)
213
215
  activesupport (>= 4.2.0)
214
- cocaine (~> 0.5.5)
215
216
  mime-types
216
217
  mimemagic (~> 0.3.0)
217
- parallel (1.12.1)
218
- parser (2.5.0.0)
218
+ terrapin (~> 0.6.0)
219
+ parallel (1.19.1)
220
+ parser (2.7.1.3)
219
221
  ast (~> 2.4.0)
220
- pg (0.21.0)
221
- polyamorous (1.3.3)
222
- activerecord (>= 3.0)
223
- powerpack (0.1.1)
222
+ pg (1.2.3)
223
+ polyamorous (2.3.2)
224
+ activerecord (>= 5.2.1)
224
225
  premailer (1.11.1)
225
226
  addressable
226
227
  css_parser (>= 1.6.0)
227
228
  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)
229
+ pry (0.13.1)
230
+ coderay (~> 1.1)
231
+ method_source (~> 1.0)
232
+ pry-rails (0.3.9)
232
233
  pry (>= 0.10.4)
233
- public_suffix (3.0.2)
234
- puma (3.11.2)
235
- rack (2.0.7)
234
+ public_suffix (4.0.5)
235
+ puma (4.3.5)
236
+ nio4r (~> 2.0)
237
+ rack (2.2.2)
236
238
  rack-test (1.1.0)
237
239
  rack (>= 1.0, < 3)
238
- rails (5.1.7)
239
- actioncable (= 5.1.7)
240
- actionmailer (= 5.1.7)
241
- actionpack (= 5.1.7)
242
- actionview (= 5.1.7)
243
- activejob (= 5.1.7)
244
- activemodel (= 5.1.7)
245
- activerecord (= 5.1.7)
246
- activesupport (= 5.1.7)
240
+ rails (5.2.4.3)
241
+ actioncable (= 5.2.4.3)
242
+ actionmailer (= 5.2.4.3)
243
+ actionpack (= 5.2.4.3)
244
+ actionview (= 5.2.4.3)
245
+ activejob (= 5.2.4.3)
246
+ activemodel (= 5.2.4.3)
247
+ activerecord (= 5.2.4.3)
248
+ activestorage (= 5.2.4.3)
249
+ activesupport (= 5.2.4.3)
247
250
  bundler (>= 1.3.0)
248
- railties (= 5.1.7)
251
+ railties (= 5.2.4.3)
249
252
  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)
253
+ rails-controller-testing (1.0.4)
254
+ actionpack (>= 5.0.1.x)
255
+ actionview (>= 5.0.1.x)
256
+ activesupport (>= 5.0.1.x)
254
257
  rails-dom-testing (2.0.3)
255
258
  activesupport (>= 4.2.0)
256
259
  nokogiri (>= 1.6)
257
260
  rails-html-sanitizer (1.3.0)
258
261
  loofah (~> 2.3)
259
- rails-i18n (5.1.0)
262
+ rails-i18n (5.1.3)
260
263
  i18n (>= 0.7, < 2)
261
264
  railties (>= 5.0, < 6)
262
265
  rails-observers (0.1.5)
@@ -270,92 +273,87 @@ GEM
270
273
  rails (> 3.1)
271
274
  rails_serve_static_assets (0.0.5)
272
275
  rails_stdout_logging (0.0.5)
273
- railties (5.1.7)
274
- actionpack (= 5.1.7)
275
- activesupport (= 5.1.7)
276
+ railties (5.2.4.3)
277
+ actionpack (= 5.2.4.3)
278
+ activesupport (= 5.2.4.3)
276
279
  method_source
277
280
  rake (>= 0.8.7)
278
- thor (>= 0.18.1, < 2.0)
281
+ thor (>= 0.19.0, < 2.0)
279
282
  rainbow (3.0.0)
280
- rake (13.0.0)
281
- ransack (1.8.7)
282
- actionpack (>= 3.0)
283
- activerecord (>= 3.0)
284
- activesupport (>= 3.0)
283
+ rake (13.0.1)
284
+ ransack (2.3.2)
285
+ activerecord (>= 5.2.1)
286
+ activesupport (>= 5.2.1)
285
287
  i18n
286
- polyamorous (~> 1.3.2)
288
+ polyamorous (= 2.3.2)
287
289
  ransack_chronic (1.1.0)
288
290
  chronic (>= 0.6.7)
289
- ransack_ui (1.3.4)
290
- ransack
291
- ransack_chronic (>= 1.1.0)
292
291
  rb-fchange (0.0.6)
293
292
  ffi
294
- rb-fsevent (0.10.2)
295
- rb-inotify (0.9.10)
296
- ffi (>= 0.5.0, < 2)
293
+ rb-fsevent (0.10.4)
294
+ rb-inotify (0.10.1)
295
+ ffi (~> 1.0)
297
296
  ref (2.0.0)
298
- request_store (1.4.0)
297
+ regexp_parser (1.7.0)
298
+ request_store (1.5.0)
299
299
  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)
300
+ responders (2.4.1)
301
+ actionpack (>= 4.2.0, < 6.0)
302
+ railties (>= 4.2.0, < 6.0)
303
+ responds_to_parent (2.0.0)
304
+ actionpack (>= 3.2.22, < 6.0)
305
+ rspec (3.9.0)
306
+ rspec-core (~> 3.9.0)
307
+ rspec-expectations (~> 3.9.0)
308
+ rspec-mocks (~> 3.9.0)
309
+ rspec-activemodel-mocks (1.1.0)
309
310
  activemodel (>= 3.0)
310
311
  activesupport (>= 3.0)
311
312
  rspec-mocks (>= 2.99, < 4.0)
312
- rspec-core (3.7.1)
313
- rspec-support (~> 3.7.0)
314
- rspec-expectations (3.7.0)
313
+ rspec-core (3.9.2)
314
+ rspec-support (~> 3.9.3)
315
+ rspec-expectations (3.9.2)
315
316
  diff-lcs (>= 1.2.0, < 2.0)
316
- rspec-support (~> 3.7.0)
317
- rspec-mocks (3.7.0)
317
+ rspec-support (~> 3.9.0)
318
+ rspec-mocks (3.9.1)
318
319
  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)
320
+ rspec-support (~> 3.9.0)
321
+ rspec-rails (4.0.1)
322
+ actionpack (>= 4.2)
323
+ activesupport (>= 4.2)
324
+ railties (>= 4.2)
325
+ rspec-core (~> 3.9)
326
+ rspec-expectations (~> 3.9)
327
+ rspec-mocks (~> 3.9)
328
+ rspec-support (~> 3.9)
329
+ rspec-support (3.9.3)
330
+ rubocop (0.76.0)
331
+ jaro_winkler (~> 1.5.1)
330
332
  parallel (~> 1.10)
331
- parser (>= 2.4.0.2, < 3.0)
332
- powerpack (~> 0.1)
333
+ parser (>= 2.6)
333
334
  rainbow (>= 2.2.2, < 4.0)
334
335
  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.3.0)
339
- sass (3.5.5)
336
+ unicode-display_width (>= 1.4.0, < 1.7)
337
+ ruby-progressbar (1.10.1)
338
+ rubyzip (2.3.0)
339
+ sass (3.7.4)
340
340
  sass-listen (~> 4.0.0)
341
341
  sass-listen (4.0.0)
342
342
  rb-fsevent (~> 0.9, >= 0.9.4)
343
343
  rb-inotify (~> 0.9, >= 0.9.7)
344
- sass-rails (5.0.7)
345
- railties (>= 4.0.0, < 6)
344
+ sass-rails (5.0.8)
345
+ railties (>= 5.2.0)
346
346
  sass (~> 3.1)
347
347
  sprockets (>= 2.8, < 4.0)
348
348
  sprockets-rails (>= 2.0, < 4.0)
349
349
  tilt (>= 1.1, < 3)
350
- scrypt (3.0.5)
351
- ffi-compiler (>= 1.0, < 2.0)
352
350
  select2-rails (4.0.3)
353
351
  thor (~> 0.14)
354
- selenium-webdriver (3.9.0)
355
- childprocess (~> 0.5)
356
- rubyzip (~> 1.2)
352
+ selenium-webdriver (3.142.7)
353
+ childprocess (>= 0.5, < 4.0)
354
+ rubyzip (>= 1.2.2)
357
355
  shellany (0.0.1)
358
- simple_form (5.0.1)
356
+ simple_form (5.0.2)
359
357
  actionpack (>= 5.0)
360
358
  activemodel (>= 5.0)
361
359
  sixarm_ruby_unaccent (1.2.0)
@@ -369,28 +367,36 @@ GEM
369
367
  activesupport (>= 4.0)
370
368
  sprockets (>= 3.0.0)
371
369
  sqlite3 (1.3.13)
372
- sshkit (1.16.0)
370
+ sshkit (1.21.0)
373
371
  net-scp (>= 1.1.2)
374
372
  net-ssh (>= 2.8.0)
375
- temple (0.8.0)
373
+ temple (0.8.2)
374
+ terrapin (0.6.0)
375
+ climate_control (>= 0.0.3, < 1.0)
376
376
  therubyracer (0.12.3)
377
377
  libv8 (~> 3.16.14.15)
378
378
  ref
379
379
  thor (0.20.3)
380
380
  thread_safe (0.3.6)
381
- tilt (2.0.8)
381
+ tilt (2.0.10)
382
382
  timecop (0.9.1)
383
- tzinfo (1.2.5)
383
+ tzinfo (1.2.7)
384
384
  thread_safe (~> 0.1)
385
- uglifier (4.1.6)
385
+ uglifier (4.2.0)
386
386
  execjs (>= 0.3.0, < 3)
387
- unicode-display_width (1.3.0)
387
+ unicode-display_width (1.6.1)
388
388
  unicode_utils (1.4.0)
389
- websocket-driver (0.6.5)
389
+ warden (1.2.8)
390
+ rack (>= 2.0.6)
391
+ webdrivers (4.4.1)
392
+ nokogiri (~> 1.6)
393
+ rubyzip (>= 1.3.0)
394
+ selenium-webdriver (>= 3.0, < 4.0)
395
+ websocket-driver (0.7.2)
390
396
  websocket-extensions (>= 0.1.0)
391
- websocket-extensions (0.1.4)
392
- will_paginate (3.1.6)
393
- xpath (3.0.0)
397
+ websocket-extensions (0.1.5)
398
+ will_paginate (3.3.0)
399
+ xpath (3.2.0)
394
400
  nokogiri (~> 1.8)
395
401
  zeus (0.15.14)
396
402
  method_source (>= 0.6.7)
@@ -399,31 +405,31 @@ PLATFORMS
399
405
  ruby
400
406
 
401
407
  DEPENDENCIES
408
+ activejob (~> 5.2.0)
402
409
  activemodel-serializers-xml
403
410
  acts-as-taggable-on (>= 3.4.3)
404
411
  acts_as_commentable
405
- acts_as_fu
406
412
  acts_as_list
407
- authlogic (>= 3.4.4)
408
413
  bootsnap
409
414
  brakeman
410
415
  byebug
411
- cancancan
416
+ cancancan (~> 3.0.0)
412
417
  capistrano
413
418
  capistrano-bundler
414
419
  capistrano-rails
415
420
  capistrano-rvm
416
421
  capybara
417
- chromedriver-helper
418
- cocaine
419
422
  coffee-rails
420
423
  coffee-script-source (~> 1.8, >= 1.8.0)
421
424
  country_select
422
425
  database_cleaner
426
+ devise (~> 4.6)
427
+ devise-encryptable
428
+ devise-i18n
423
429
  dynamic_form
424
430
  email_reply_parser_ffcrm
425
431
  execjs
426
- factory_bot_rails
432
+ factory_bot_rails (~> 5.0)
427
433
  ffaker (>= 2)
428
434
  font-awesome-rails
429
435
  guard
@@ -435,13 +441,13 @@ DEPENDENCIES
435
441
  jquery-rails
436
442
  jquery-ui-rails
437
443
  nokogiri (>= 1.8.1)
438
- paper_trail (~> 6.0.0)
444
+ paper_trail (~> 10.0.0)
439
445
  paperclip
440
- pg (~> 0.21.0)
446
+ pg
441
447
  premailer
442
448
  pry-rails
443
449
  puma
444
- rails (~> 5.1.0)
450
+ rails (~> 5.2.0)
445
451
  rails-controller-testing
446
452
  rails-i18n
447
453
  rails-observers
@@ -449,8 +455,8 @@ DEPENDENCIES
449
455
  rails_12factor
450
456
  rails_autolink
451
457
  rainbow
452
- ransack (~> 1.7, >= 1.6.2)
453
- ransack_ui (~> 1.3, >= 1.3.1)
458
+ ransack (>= 1.6.2)
459
+ ransack_ui!
454
460
  rb-fchange
455
461
  rb-fsevent
456
462
  rb-inotify
@@ -458,20 +464,22 @@ DEPENDENCIES
458
464
  responds_to_parent
459
465
  rspec-activemodel-mocks
460
466
  rspec-rails
461
- rubocop (~> 0.52.0)
467
+ rubocop (~> 0.76.0)
462
468
  sass
463
- sass-rails
469
+ sass-rails (~> 5.0.3)
464
470
  select2-rails
465
471
  selenium-webdriver
466
472
  simple_form
467
473
  sprockets-rails (>= 3.0.0)
474
+ sqlite3 (~> 1.3.13)
468
475
  therubyracer
469
476
  thor
470
477
  timecop
471
478
  tzinfo-data
472
479
  uglifier
480
+ webdrivers
473
481
  will_paginate
474
482
  zeus
475
483
 
476
484
  BUNDLED WITH
477
- 1.17.1
485
+ 2.1.4