fat_free_crm 0.14.2 → 0.15.0.beta

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 (95) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +15 -5
  3. data/{CHANGELOG → CHANGELOG.md} +9 -8
  4. data/Gemfile +1 -1
  5. data/Gemfile.lock +78 -70
  6. data/README.md +8 -10
  7. data/app/controllers/admin/users_controller.rb +6 -1
  8. data/app/controllers/application_controller.rb +2 -0
  9. data/app/controllers/users_controller.rb +1 -0
  10. data/app/helpers/tags_helper.rb +1 -1
  11. data/app/models/users/user.rb +10 -9
  12. data/config/initializers/paper_trail.rb +1 -0
  13. data/fat_free_crm.gemspec +4 -4
  14. data/lib/development_tasks/rspec.rake +2 -6
  15. data/lib/fat_free_crm/engine.rb +5 -0
  16. data/lib/fat_free_crm/version.rb +3 -3
  17. data/spec/factories/field_factories.rb +1 -1
  18. data/spec/factories/opportunity_factories.rb +1 -1
  19. data/spec/mailers/subscription_mailer_spec.rb +5 -3
  20. data/spec/mailers/user_mailer_spec.rb +6 -6
  21. data/spec/models/users/abilities/user_ability_spec.rb +3 -3
  22. data/spec/models/users/user_spec.rb +73 -62
  23. data/spec/support/auth_macros.rb +8 -1
  24. data/spec/views/accounts/_edit.haml_spec.rb +1 -1
  25. data/spec/views/accounts/create.js.haml_spec.rb +1 -1
  26. data/spec/views/accounts/destroy.js.haml_spec.rb +1 -1
  27. data/spec/views/accounts/edit.js.haml_spec.rb +2 -2
  28. data/spec/views/accounts/index.haml_spec.rb +2 -2
  29. data/spec/views/accounts/index.js.haml_spec.rb +1 -1
  30. data/spec/views/accounts/update.js.haml_spec.rb +1 -1
  31. data/spec/views/admin/field_groups/create.js.haml_spec.rb +1 -1
  32. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +1 -1
  33. data/spec/views/admin/field_groups/new.js.haml_spec.rb +1 -1
  34. data/spec/views/admin/field_groups/update.js.haml_spec.rb +1 -1
  35. data/spec/views/admin/users/create.js.haml_spec.rb +1 -1
  36. data/spec/views/admin/users/destroy.js.haml_spec.rb +1 -1
  37. data/spec/views/admin/users/edit.js.haml_spec.rb +2 -2
  38. data/spec/views/admin/users/index.haml_spec.rb +1 -1
  39. data/spec/views/admin/users/index.js.haml_spec.rb +2 -2
  40. data/spec/views/admin/users/reactivate.js.haml_spec.rb +1 -1
  41. data/spec/views/admin/users/suspend.js.haml_spec.rb +1 -1
  42. data/spec/views/admin/users/update.js.haml_spec.rb +1 -1
  43. data/spec/views/application/auto_complete.haml_spec.rb +3 -3
  44. data/spec/views/campaigns/_edit.haml_spec.rb +1 -1
  45. data/spec/views/campaigns/create.js.haml_spec.rb +2 -2
  46. data/spec/views/campaigns/destroy.js.haml_spec.rb +1 -1
  47. data/spec/views/campaigns/edit.js.haml_spec.rb +2 -2
  48. data/spec/views/campaigns/index.haml_spec.rb +1 -1
  49. data/spec/views/campaigns/index.js.haml_spec.rb +1 -1
  50. data/spec/views/campaigns/show.haml_spec.rb +4 -4
  51. data/spec/views/campaigns/update.js.haml_spec.rb +1 -1
  52. data/spec/views/contacts/_new.haml_spec.rb +1 -1
  53. data/spec/views/contacts/create.js.haml_spec.rb +3 -3
  54. data/spec/views/contacts/destroy.js.haml_spec.rb +1 -1
  55. data/spec/views/contacts/edit.js.haml_spec.rb +3 -3
  56. data/spec/views/contacts/index.haml_spec.rb +1 -1
  57. data/spec/views/contacts/index.js.html_spec.rb +1 -1
  58. data/spec/views/contacts/new.js.haml_spec.rb +1 -1
  59. data/spec/views/contacts/update.js.haml_spec.rb +2 -2
  60. data/spec/views/home/index.haml_spec.rb +1 -1
  61. data/spec/views/home/index.js.haml_spec.rb +2 -2
  62. data/spec/views/home/options.js.haml_spec.rb +2 -2
  63. data/spec/views/leads/_convert.haml_spec.rb +3 -3
  64. data/spec/views/leads/_edit.haml_spec.rb +2 -2
  65. data/spec/views/leads/_new.haml_spec.rb +1 -1
  66. data/spec/views/leads/_sidebar_show.haml_spec.rb +1 -1
  67. data/spec/views/leads/convert.js.haml_spec.rb +4 -4
  68. data/spec/views/leads/create.js.haml_spec.rb +3 -3
  69. data/spec/views/leads/destroy.js.haml_spec.rb +2 -2
  70. data/spec/views/leads/edit.js.haml_spec.rb +4 -4
  71. data/spec/views/leads/index.haml_spec.rb +1 -1
  72. data/spec/views/leads/index.js.haml_spec.rb +1 -1
  73. data/spec/views/leads/new.js.haml_spec.rb +1 -1
  74. data/spec/views/leads/promote.js.haml_spec.rb +7 -7
  75. data/spec/views/leads/reject.js.haml_spec.rb +2 -2
  76. data/spec/views/leads/show.haml_spec.rb +2 -2
  77. data/spec/views/leads/update.js.haml_spec.rb +4 -4
  78. data/spec/views/opportunities/_edit.haml_spec.rb +5 -5
  79. data/spec/views/opportunities/_new.haml_spec.rb +1 -1
  80. data/spec/views/opportunities/create.js.haml_spec.rb +3 -3
  81. data/spec/views/opportunities/destroy.js.haml_spec.rb +3 -3
  82. data/spec/views/opportunities/edit.js.haml_spec.rb +3 -3
  83. data/spec/views/opportunities/index.haml_spec.rb +1 -1
  84. data/spec/views/opportunities/index.js.haml_spec.rb +1 -1
  85. data/spec/views/opportunities/new.js.haml_spec.rb +1 -1
  86. data/spec/views/opportunities/update.js.haml_spec.rb +4 -4
  87. data/spec/views/tasks/_edit.haml_spec.rb +1 -1
  88. data/spec/views/tasks/complete.js.haml_spec.rb +4 -4
  89. data/spec/views/tasks/create.js.haml_spec.rb +5 -5
  90. data/spec/views/tasks/destroy.js.haml_spec.rb +2 -2
  91. data/spec/views/tasks/index.haml_spec.rb +4 -4
  92. data/spec/views/tasks/uncomplete.js.haml_spec.rb +2 -2
  93. data/spec/views/tasks/update.js.haml_spec.rb +18 -18
  94. data/spec/views/users/upload_avatar.js.haml_spec.rb +2 -2
  95. metadata +17 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 91bf600f70e89b2af57ebf332ef9e90550f5ee9fcfb4ce624eb4150bb64af7e8
4
- data.tar.gz: ea34e819ea4f7c7104c9724167a11790734528f96f274f6d14a39cd39fb284f8
2
+ SHA1:
3
+ metadata.gz: a071a602569fb3e0d40511198ecb2cd684ab8e37
4
+ data.tar.gz: c1362f3d1eb8169185a4dee8cfef232129852da7
5
5
  SHA512:
6
- metadata.gz: 285ecf6eae7e9c898c17e6603309cf50275ff0776bef190bb1facb67ce4e45b72deacfb9c479287b578ea669eeb107fbd48e866d35dd39f3beb948839ccb4840
7
- data.tar.gz: 6d1fa7b4ec122f161d4c73c05b22765cb5b5e874f6089c0990729b7f9e4ccf1f38036e6f73a7ca89488b76a24bb580a468b8a5a6d91fb2aa00555394a58849e1
6
+ metadata.gz: 916af6c80fe05ee22ca5708ceb8db0c821fe2ee24b9f1fe3c344ac96cf0ad925d71bc122928b7cc4eda9787ec9175ca6876ff39699f2e3cbd7389ae55feedec9
7
+ data.tar.gz: 3b4e68311bbd2a76883674446c8fab4f8431b86b534adc79b1ef3a78281d528695b1dd89fea81b275a8dcbf81d754a5e0bea9b9820f01e2daec8a813ae318e30
@@ -1,8 +1,8 @@
1
1
  sudo: false
2
2
  language: ruby
3
3
  rvm:
4
- - 2.2
5
4
  - 2.3.3
5
+ # - 2.4.0
6
6
  env:
7
7
  - DB=mysql
8
8
  - DB=postgres
@@ -10,9 +10,9 @@ env:
10
10
 
11
11
  matrix:
12
12
  exclude:
13
- - rvm: 2.2
13
+ - rvm: 2.3.3
14
14
  env: DB=mysql
15
- - rvm: 2.2
15
+ - rvm: 2.3.3
16
16
  env: DB=sqlite
17
17
 
18
18
  bundler_args: --path=vendor/bundle --without heroku
@@ -27,10 +27,20 @@ before_script:
27
27
  - sh -c "cp config/database.$DB.yml config/database.yml"
28
28
  - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database fat_free_crm_test;' -U postgres; fi"
29
29
  - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database fat_free_crm_test;'; fi"
30
- - sh -c "RAILS_ENV=test bundle exec rake db:schema:load"
30
+ - "RAILS_ENV=test bundle exec rake spec:preparedb"
31
31
 
32
32
  # Run specs
33
- script: "RAILS_ENV=test bundle exec rake"
33
+ script:
34
+ - "RAILS_ENV=test bundle exec rake spec:models"
35
+ - "RAILS_ENV=test bundle exec rake spec:mailers"
36
+ - "RAILS_ENV=test bundle exec rake spec:controllers"
37
+ - "RAILS_ENV=test bundle exec rake spec:helpers"
38
+ - "RAILS_ENV=test bundle exec rake spec:lib"
39
+ - "RAILS_ENV=test bundle exec rake spec:mailers"
40
+ - "RAILS_ENV=test bundle exec rake spec:routing"
41
+ - "RAILS_ENV=test bundle exec rake spec:views"
42
+ - "RAILS_ENV=test bundle exec rake spec:features"
43
+
34
44
 
35
45
  notifications:
36
46
  webhooks:
@@ -4,16 +4,17 @@ It does not matter how slowly you go as long as you do not stop.
4
4
  First they ignore you, then they laugh at you, then they fight you,
5
5
  then you win. –- Mahatma Gandhi
6
6
 
7
- Sat Oct 27, 2018 (0.14.2)
7
+ Wed, Dec 7, 2016 (0.15.0-beta)
8
8
  ---------------------------------------------------------------------
9
+ This release is aimed at getting as many dependencies as possible up to date without significant refactoring.
9
10
 
10
- #### Fixed XSS flaw in tags_helper
11
- Credit Antonin Steinhauser (steinhause) for discovery and responsible disclosure.
12
-
13
- Wed Jan 24, 2018 (0.14.1)
14
- ---------------------------------------------------------------------
15
-
16
- - Fix for CVE-2017-0889 (Paperclip)
11
+ - Refactoring: Tests prefer build, build_record over ```FactoryGirl.create``` where possible
12
+ - Refactoring: View tests minimize DB interaction greatly
13
+ - Refactoring: ```@user.check_if_needs_approval``` must be explicitly called in rake tasks or similar, it is no longer a before_create hook
14
+ - Refactoring: ```@user.destroyable?``` must be called in rake tasks or similar, it is no longer a before_destroy check
15
+ - Various gem updates
16
+ - Upgrade to Paperclip 5 (see https://github.com/thoughtbot/paperclip/wiki/Upgrade-Paperclip-4x-to-5x)
17
+ - Upgrade to paper_trail 6+ (https://github.com/airblade/paper_trail/blob/master/CHANGELOG.md)
17
18
 
18
19
  Mon, Dec 5, 2016 (0.14.0)
19
20
  ---------------------------------------------------------------------
data/Gemfile CHANGED
@@ -68,7 +68,7 @@ end
68
68
 
69
69
  group :test do
70
70
  gem 'capybara'
71
- gem 'selenium-webdriver'
71
+ gem 'selenium-webdriver', '< 3.0.0'
72
72
  gem 'database_cleaner'
73
73
  gem "acts_as_fu"
74
74
  gem 'zeus' unless ENV["CI"]
@@ -36,39 +36,45 @@ GEM
36
36
  minitest (~> 5.1)
37
37
  thread_safe (~> 0.3, >= 0.3.4)
38
38
  tzinfo (~> 1.1)
39
- acts-as-taggable-on (3.5.0)
40
- activerecord (>= 3.2, < 5)
39
+ acts-as-taggable-on (4.0.0)
40
+ activerecord (>= 4.0)
41
41
  acts_as_commentable (4.0.2)
42
42
  acts_as_fu (0.0.9)
43
43
  activerecord
44
44
  sqlite3
45
- acts_as_list (0.7.2)
45
+ acts_as_list (0.8.2)
46
46
  activerecord (>= 3.0)
47
47
  addressable (2.5.0)
48
48
  public_suffix (~> 2.0, >= 2.0.2)
49
+ airbrussh (1.1.1)
50
+ sshkit (>= 1.6.1, != 1.7.0)
49
51
  arel (6.0.3)
50
52
  authlogic (3.4.6)
51
53
  activerecord (>= 3.2)
52
54
  activesupport (>= 3.2)
53
55
  request_store (~> 1.0)
54
56
  scrypt (>= 1.2, < 3.0)
55
- builder (3.2.3)
56
- byebug (8.2.1)
57
+ builder (3.2.2)
58
+ byebug (9.0.6)
57
59
  cancancan (1.15.0)
58
- capistrano (3.4.0)
60
+ capistrano (3.6.1)
61
+ airbrussh (>= 1.0.0)
62
+ capistrano-harrow
59
63
  i18n
60
64
  rake (>= 10.0.0)
61
- sshkit (~> 1.3)
62
- capistrano-bundler (1.1.4)
65
+ sshkit (>= 1.9.0)
66
+ capistrano-bundler (1.2.0)
63
67
  capistrano (~> 3.1)
64
68
  sshkit (~> 1.2)
65
- capistrano-rails (1.1.5)
69
+ capistrano-harrow (0.5.3)
70
+ capistrano-rails (1.2.0)
66
71
  capistrano (~> 3.1)
67
72
  capistrano-bundler (~> 1.1)
68
73
  capistrano-rvm (0.1.2)
69
74
  capistrano (~> 3.0)
70
75
  sshkit (~> 1.2)
71
- capybara (2.5.0)
76
+ capybara (2.10.2)
77
+ addressable
72
78
  mime-types (>= 1.16)
73
79
  nokogiri (>= 1.3.3)
74
80
  rack (>= 1.0.0)
@@ -77,41 +83,42 @@ GEM
77
83
  childprocess (0.5.9)
78
84
  ffi (~> 1.0, >= 1.0.11)
79
85
  chronic (0.10.2)
80
- climate_control (0.2.0)
86
+ climate_control (0.0.3)
87
+ activesupport (>= 3.0)
81
88
  cocaine (0.5.8)
82
89
  climate_control (>= 0.0.3, < 1.0)
83
90
  coderay (1.1.1)
84
- coffee-rails (4.1.1)
91
+ coffee-rails (4.2.1)
85
92
  coffee-script (>= 2.2.0)
86
- railties (>= 4.0.0, < 5.1.x)
93
+ railties (>= 4.0.0, < 5.2.x)
87
94
  coffee-script (2.4.1)
88
95
  coffee-script-source
89
96
  execjs
90
97
  coffee-script-source (1.8.0)
91
98
  concurrent-ruby (1.0.2)
92
- countries (1.2.2)
93
- currencies (~> 0.4.2)
99
+ countries (2.0.4)
94
100
  i18n_data (~> 0.7.0)
95
- country_select (2.5.1)
96
- countries (~> 1.2.0)
101
+ money (~> 6.7)
102
+ unicode_utils (~> 1.4)
103
+ country_select (3.0.0)
104
+ countries (~> 2.0)
97
105
  sort_alphabetical (~> 1.0)
98
106
  css_parser (1.4.7)
99
107
  addressable
100
- currencies (0.4.2)
101
108
  daemons (1.2.4)
102
- database_cleaner (1.5.1)
109
+ database_cleaner (1.5.3)
103
110
  diff-lcs (1.2.5)
104
111
  dynamic_form (1.1.4)
105
112
  email_reply_parser_ffcrm (0.5.0)
106
113
  erubis (2.7.0)
107
114
  eventmachine (1.2.1)
108
- execjs (2.6.0)
115
+ execjs (2.7.0)
109
116
  factory_girl (4.7.0)
110
117
  activesupport (>= 3.0.0)
111
118
  factory_girl_rails (4.7.0)
112
119
  factory_girl (~> 4.7.0)
113
120
  railties (>= 3.0.0)
114
- ffaker (2.1.0)
121
+ ffaker (2.3.0)
115
122
  ffi (1.9.14)
116
123
  ffi-compiler (1.0.1)
117
124
  ffi (>= 1.0.0)
@@ -121,9 +128,9 @@ GEM
121
128
  formatador (0.2.5)
122
129
  globalid (0.3.7)
123
130
  activesupport (>= 4.1.0)
124
- guard (2.13.0)
131
+ guard (2.14.0)
125
132
  formatador (>= 0.2.4)
126
- listen (>= 2.7, <= 4.0)
133
+ listen (>= 2.7, < 4.0)
127
134
  lumberjack (~> 1.0)
128
135
  nenv (~> 0.1)
129
136
  notiffany (~> 0.0)
@@ -131,33 +138,33 @@ GEM
131
138
  shellany (~> 0.0)
132
139
  thor (>= 0.18.1)
133
140
  guard-compat (1.2.1)
134
- guard-rails (0.7.2)
141
+ guard-rails (0.8.0)
135
142
  guard (~> 2.11)
136
143
  guard-compat (~> 1.0)
137
- guard-rspec (4.6.4)
144
+ guard-rspec (4.7.3)
138
145
  guard (~> 2.1)
139
146
  guard-compat (~> 1.1)
140
147
  rspec (>= 2.99.0, < 4.0)
141
148
  haml (4.0.7)
142
149
  tilt
143
- headless (2.2.0)
150
+ headless (2.3.1)
144
151
  htmlentities (4.3.4)
145
- i18n (0.9.3)
146
- concurrent-ruby (~> 1.0)
152
+ i18n (0.7.0)
147
153
  i18n_data (0.7.0)
148
154
  jquery-migrate-rails (1.2.1)
149
- jquery-rails (4.0.5)
150
- rails-dom-testing (~> 1.0)
155
+ jquery-rails (4.2.1)
156
+ rails-dom-testing (>= 1, < 3)
151
157
  railties (>= 4.2.0)
152
158
  thor (>= 0.14, < 2.0)
153
- jquery-ui-rails (5.0.5)
159
+ jquery-ui-rails (6.0.1)
154
160
  railties (>= 3.2.16)
155
- json (1.8.6)
161
+ json (1.8.3)
156
162
  kgio (2.10.0)
157
163
  libv8 (3.16.14.17)
158
- listen (3.0.5)
159
- rb-fsevent (>= 0.9.3)
160
- rb-inotify (>= 0.9)
164
+ listen (3.1.5)
165
+ rb-fsevent (~> 0.9, >= 0.9.4)
166
+ rb-inotify (~> 0.9, >= 0.9.7)
167
+ ruby_dep (~> 1.2)
161
168
  loofah (2.0.3)
162
169
  nokogiri (>= 1.5.9)
163
170
  lumberjack (1.0.10)
@@ -169,32 +176,33 @@ GEM
169
176
  mime-types-data (3.2016.0521)
170
177
  mimemagic (0.3.2)
171
178
  mini_portile2 (2.1.0)
172
- minitest (5.11.1)
173
- multi_json (1.11.2)
179
+ minitest (5.10.1)
180
+ money (6.7.1)
181
+ i18n (>= 0.6.4, <= 0.7.0)
182
+ sixarm_ruby_unaccent (>= 1.1.1, < 2)
174
183
  nenv (0.3.0)
175
184
  net-scp (1.2.1)
176
185
  net-ssh (>= 2.6.5)
177
186
  net-ssh (3.2.0)
178
187
  nokogiri (1.6.8.1)
179
188
  mini_portile2 (~> 2.1.0)
180
- notiffany (0.0.8)
189
+ notiffany (0.1.1)
181
190
  nenv (~> 0.1)
182
191
  shellany (~> 0.0)
183
- paper_trail (4.0.1)
184
- activerecord (>= 3.0, < 6.0)
185
- activesupport (>= 3.0, < 6.0)
192
+ paper_trail (6.0.1)
193
+ activerecord (>= 4.0, < 5.2)
186
194
  request_store (~> 1.1)
187
- paperclip (5.2.0)
195
+ paperclip (5.1.0)
188
196
  activemodel (>= 4.2.0)
189
197
  activesupport (>= 4.2.0)
190
198
  cocaine (~> 0.5.5)
191
199
  mime-types
192
200
  mimemagic (~> 0.3.0)
193
- pg (0.18.4)
194
- polyamorous (1.3.0)
201
+ pg (0.19.0)
202
+ polyamorous (1.3.1)
195
203
  activerecord (>= 3.0)
196
- premailer (1.8.6)
197
- css_parser (>= 1.3.6)
204
+ premailer (1.8.7)
205
+ css_parser (>= 1.4.5)
198
206
  htmlentities (>= 4.0.0)
199
207
  pry (0.10.4)
200
208
  coderay (~> 1.1.0)
@@ -236,8 +244,8 @@ GEM
236
244
  rails_stdout_logging
237
245
  rails_autolink (1.1.6)
238
246
  rails (> 3.1)
239
- rails_serve_static_assets (0.0.4)
240
- rails_stdout_logging (0.0.4)
247
+ rails_serve_static_assets (0.0.5)
248
+ rails_stdout_logging (0.0.5)
241
249
  railties (4.2.7.1)
242
250
  actionpack (= 4.2.7.1)
243
251
  activesupport (= 4.2.7.1)
@@ -262,7 +270,7 @@ GEM
262
270
  rb-inotify (0.9.7)
263
271
  ffi (>= 0.5.0)
264
272
  ref (2.0.0)
265
- request_store (1.2.1)
273
+ request_store (1.3.1)
266
274
  responders (2.1.1)
267
275
  railties (>= 4.2.0, < 5.1)
268
276
  responds_to_parent (1.1.0)
@@ -270,7 +278,7 @@ GEM
270
278
  rspec-core (~> 3.5.0)
271
279
  rspec-expectations (~> 3.5.0)
272
280
  rspec-mocks (~> 3.5.0)
273
- rspec-activemodel-mocks (1.0.2)
281
+ rspec-activemodel-mocks (1.0.3)
274
282
  activemodel (>= 3.0)
275
283
  activesupport (>= 3.0)
276
284
  rspec-mocks (>= 2.99, < 4.0)
@@ -291,28 +299,29 @@ GEM
291
299
  rspec-mocks (~> 3.5.0)
292
300
  rspec-support (~> 3.5.0)
293
301
  rspec-support (3.5.0)
302
+ ruby_dep (1.5.0)
294
303
  rubyzip (1.2.0)
295
- sass (3.4.20)
296
- sass-rails (5.0.4)
297
- railties (>= 4.0.0, < 5.0)
304
+ sass (3.4.22)
305
+ sass-rails (5.0.6)
306
+ railties (>= 4.0.0, < 6)
298
307
  sass (~> 3.1)
299
308
  sprockets (>= 2.8, < 4.0)
300
309
  sprockets-rails (>= 2.0, < 4.0)
301
310
  tilt (>= 1.1, < 3)
302
- scrypt (2.0.2)
311
+ scrypt (2.1.1)
303
312
  ffi-compiler (>= 0.0.2)
304
313
  rake
305
- select2-rails (3.5.9.3)
314
+ select2-rails (4.0.3)
306
315
  thor (~> 0.14)
307
- selenium-webdriver (2.48.1)
316
+ selenium-webdriver (2.53.4)
308
317
  childprocess (~> 0.5)
309
- multi_json (~> 1.0)
310
318
  rubyzip (~> 1.0)
311
319
  websocket (~> 1.0)
312
320
  shellany (0.0.1)
313
- simple_form (3.2.1)
321
+ simple_form (3.3.1)
314
322
  actionpack (> 4, < 5.1)
315
323
  activemodel (> 4, < 5.1)
324
+ sixarm_ruby_unaccent (1.1.1)
316
325
  slop (3.6.0)
317
326
  sort_alphabetical (1.1.0)
318
327
  unicode_utils (>= 1.2.2)
@@ -330,29 +339,28 @@ GEM
330
339
  therubyracer (0.12.2)
331
340
  libv8 (~> 3.16.14.0)
332
341
  ref
333
- thin (1.6.4)
342
+ thin (1.7.0)
334
343
  daemons (~> 1.0, >= 1.0.9)
335
344
  eventmachine (~> 1.0, >= 1.0.4)
336
- rack (~> 1.0)
345
+ rack (>= 1, < 3)
337
346
  thor (0.19.4)
338
- thread_safe (0.3.6)
347
+ thread_safe (0.3.5)
339
348
  tilt (2.0.5)
340
349
  timecop (0.8.1)
341
- tzinfo (1.2.4)
350
+ tzinfo (1.2.2)
342
351
  thread_safe (~> 0.1)
343
352
  uglifier (2.7.2)
344
353
  execjs (>= 0.3.0)
345
354
  json (>= 1.8.0)
346
355
  unicode_utils (1.4.0)
347
- unicorn (5.0.1)
356
+ unicorn (5.2.0)
348
357
  kgio (~> 2.6)
349
- rack
350
358
  raindrops (~> 0.7)
351
359
  websocket (1.2.3)
352
- will_paginate (3.0.7)
360
+ will_paginate (3.1.5)
353
361
  xpath (2.0.0)
354
362
  nokogiri (~> 1.3)
355
- zeus (0.15.4)
363
+ zeus (0.15.10)
356
364
  method_source (>= 0.6.7)
357
365
 
358
366
  PLATFORMS
@@ -391,7 +399,7 @@ DEPENDENCIES
391
399
  jquery-rails
392
400
  jquery-ui-rails
393
401
  nokogiri (>= 1.6.8)
394
- paper_trail (>= 4.0.0.beta2)
402
+ paper_trail (~> 6.0.0)
395
403
  paperclip
396
404
  pg
397
405
  premailer
@@ -413,8 +421,8 @@ DEPENDENCIES
413
421
  rspec-rails
414
422
  sass
415
423
  sass-rails
416
- select2-rails (~> 3.5.9.3)
417
- selenium-webdriver
424
+ select2-rails
425
+ selenium-webdriver (< 3.0.0)
418
426
  simple_form
419
427
  sprockets-rails (= 2.2.2)
420
428
  therubyracer
@@ -427,4 +435,4 @@ DEPENDENCIES
427
435
  zeus
428
436
 
429
437
  BUNDLED WITH
430
- 1.16.1
438
+ 1.12.5
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url] [![Code Climate](https://codeclimate.com/github/fatfreecrm/fat_free_crm.png)](https://codeclimate.com/github/fatfreecrm/fat_free_crm)
2
2
 
3
- [travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
4
- [travis-ci-url]: http://travis-ci.org/fatfreecrm/fat_free_crm
3
+ [travis-img-url]: https://secure.travis-ci.org/fat_free_crm/fat_free_crm.png?branch=master
4
+ [travis-ci-url]: https://travis-ci.org/fat_free_crm/fat_free_crm
5
5
 
6
6
  ### An open source, Ruby on Rails [customer relationship management][crm-wiki] platform (CRM).
7
7
 
@@ -48,19 +48,17 @@ Pull requests and bug reports are always welcome!
48
48
 
49
49
  Visit our website at http://www.fatfreecrm.com/
50
50
 
51
- ## Rails 4 support
51
+ ## Usage
52
+ To use this; simply add to your Gemfile
53
+ ```
54
+ gem 'fat_free_crm'
55
+ ```
52
56
 
53
- The master branch is now on Rails 4.2. However, there is a [Rails 3.2 branch](https://github.com/fatfreecrm/fat_free_crm/tree/rails3) available if you still need to use it. Please note that subsequent gem releases will focus on Rails 4 (v0.14.0+ as yet unreleased).
54
57
 
55
- ## Important security note
56
-
57
- Please note that several severe vulnerabilities have been fixed recently. You should upgrade to the most recent 0.13.x version or higher. See the [**security vulnerabilities**](https://github.com/fatfreecrm/fat_free_crm/wiki/Security) page for more details.
58
58
 
59
59
  ## System Requirements
60
60
 
61
- * Ruby 2 (2.2 recommended)
62
- * Ruby 1.9.3 is no longer compatible (final gem release tag v0.13.6)
63
- * Ruby v1.8.7 was supported until v0.11.4 (see https://github.com/fatfreecrm/fat_free_crm/tree/ruby1.8)
61
+ * Ruby 2.3+ recommended
64
62
  * MySQL v4.1.1 or later (v5+ is recommended), SQLite v3.4 or later, or Postgres 8.4.8 or later.
65
63
  * ImageMagick (optional, only needed if you would like to use avatars)
66
64