fat_free_crm 0.15.0.beta → 0.15.0.beta.2

data/.travis.yml

@@ -40,7 +40,7 @@ script:
   - "RAILS_ENV=test bundle exec rake spec:routing"
   - "RAILS_ENV=test bundle exec rake spec:views"
   - "RAILS_ENV=test bundle exec rake spec:features"
-
+  - "RAILS_ENV=test bundle exec rubocop"
 
 notifications:
   webhooks:

data/CHANGELOG.md

@@ -18,30 +18,166 @@ This release is aimed at getting as many dependencies as possible up to date wit
 
 Mon, Dec 5, 2016 (0.14.0)
 ---------------------------------------------------------------------
-Forked to publish 'reduced_fat_crm', a version of fat-free-crm with 
-more pull requests merged and more contributors.
-
-At this stage, no classes etc have been renamed.
-
 - Various security fixes
 - Enable CORS headers
 - Ruby 2.0 or less dropped from CI
 
 
-Missing release notes
----------------------------------------------------------------------
 0.13.6 - February 12, 2015
+---------------------------------------------------------------------
+ - Fixes #413 and #414 - bold tag being escaped on user profile.
+ - Fix for CVE-2015-1585 - CSRF vulnerability.
+
+Full list:
+https://github.com/fatfreecrm/fat_free_crm/compare/v0.13.5...v0.13.6
+
 0.13.5 - January 22, 2015
+---------------------------------------------------------------------
+ - Update gems
+ - Fixed #337 Added index on Versions created_at
+ - [Security] Team section should not display opportunities current user is not allowed to see...
+ - Update to rails 3.2.20
+ - Fixed issue #347
+ - Fixed issue #349
+ - Fixed #351 - missing interpolation argument.
+ - Fixed #353 - observes is a prototype function that is no longer used.
+ - Fixed #283 - email max length is 254 according to IETF
+ - Fix avatar issue in recent_activity
+ - Merge pull request #354 
+ - Fixed custom field handling of html entities.
+ - Merge pull request #355
+ - Fixed issue #374 - global lists missing from UK translation file.
+ - Fix #356 - default SMTP session should have no auth
+
+
+Full list:
+https://github.com/fatfreecrm/fat_free_crm/compare/v0.13.4...v0.13.5
+
 0.13.4 - September 4, 2014
+---------------------------------------------------------------------
+ - Fixed XSS vulnerability in helper method.
+ - Use rails_autolink gem which contains updated XSS fixes.
+ - Fixed XSS vulnerability if email data is manipulated.
+
+Full list:
+https://github.com/fatfreecrm/fat_free_crm/compare/v0.13.3...v0.13.4
+
 0.13.3 - August 26, 2014
+---------------------------------------------------------------------
+ - Fixed bug where starts_on was being used instead of ends_on.      a0f69d7
+ - fixes bug with toggling select/create account when converting lead      7c76b9c
+ - Russian locale fixes. 
+ - Add entity_observer to list of observers when running as an engine.
+ - Allow notification emails to be sent from a particular address. Many 
+ - Convert tag select box to Select2. We're deprecating Chosen
+ - Enable fallback translations.
+ - Fixed 'end of week' spec in tasks using Timecop.
+ - Fixed bug with recent items box replacement.
+ - #311 - problem with Thor being reference before it is loa
+ - Fixed some bugs related to sorting custom fields.
+ - #334 Added byebug for ruby2+.      5dca0ba
+ - Update rails
+ - Update gems
+ - removes prototype-rails dependency
+ - replaces prototype with jquery
+
+Full list:
+https://github.com/fatfreecrm/fat_free_crm/compare/v0.13.2...v0.13.3
+
 0.13.2 - January 9, 2014
+---------------------------------------------------------------------
+ - Fixed issue with secret token not being saved if DB does not exist.
+  
 0.13.1 - January 7, 2014
-0.13.0 - December 27, 2013
+---------------------------------------------------------------------
+ - Lock down routes.
+ - Remove stub hook
+ - Remove unneccessary function
+ - Don't spam gmail by default
+ - consider_all_requests_local should be off by default in production mode
+ - Remove pysch by default (optimise for ruby 2 now)
+ - Fixed regular expression logic to be more sensitive to newline attacks.
+ - users_controller requires security on its actions.
+ - Send emails to file in development mode
+ - Don't show user list if not logged in.
+ - Remove old 'rake acceptance' task     2d4411a
+ - Refactored secret token generation code
+ - Hide password related attributes from the logs.
+ - File syntax layout tweak.
+ - Escape autocomplete output safely.
+ - Locked down available views in Task.
+ - sanitize list.url
+ - Don't generate secret token in test mode.
+ - Don't raise secret token generation error during tests.
+
+Full list
+https://github.com/fatfreecrm/fat_free_crm/compare/v0.13.0...v0.13.1
+
+Fri Dec 27, 2013 (0.13.0)
+---------------------------------------------------------------------
+- Add user_id to lists table    
+- Add campaign to opportunity advanced search.
+- Add id to export formats. 
+- Added ActiveSupport lazy load hooks for all models in Fat Free CRM.
+- Added timeago library to enable future caching of search results. 
+- Atom and RSS feeds now deal with cases where user doesn't exist.
+- Better solution to internationalizing jquery.timeago plugin. 
+- Configurationise the uniqueness constraint for account first names 
+- Convert settings from syck to psych and remove dependency on Syck.
+- Enforce available locales in latest version of I18n. 
+- German translations
+- Introducing client-side unobtrusive javascript for new comments.
+- Peg paper_trail to v2.7
+- Replaces rjs with erb/haml
+- Updated to latest rails version
+
+Bug fixes
+- Ensure user isn't deleted if they still have tasks.
+- Fix delete button not showing    
+- Fix global list save problem     
+- Closes #268: Replace the contents of "div#leads_pagination"
+- #242 and #245. Fix cohsen_select helper to be able to
+- Fixed issue #282
+- Fixed issue with account categories inclusion matcher.
+- Fixed issue with timeago plugin not precompiling. Resolves issue #286
+- Fixed issue#281 - psych v2 is not supported.      
+- Fixed one_submit_only js format and fixed red background highlight
+- Fixed uninitialized constant 'Version' error on dashboard ATOM/RSS
+- #270. Fixed procfile command for heroku. 
+- #273 from notentered/testFixes      
+- #279 from roadt/bugfix       
+- #284 from roadt/bugfix   
+- #287 from szetobo/fix_test_case   
+- #288 from szetobo/update_scope     
+- rake ffcrm:setup no longer nukes the database before starting.
+
+Full changes:
+https://github.com/fatfreecrm/fat_free_crm/compare/v0.12.3...v0.13.0
+
+
 0.12.3 - January 9, 2014
+---------------------------------------------------------------------
+No changes
+
 0.12.2 - January 7, 2014
-0.12.1 - December 27, 2013
+---------------------------------------------------------------------
+ - users_controller requires security on its actions.
+ - Refactored secret token generation code to generate and persist a secret token in the DB if one doesn't exist
+ - Don't show user list if not logged in.
+ - Hide password related attributes from the logs.
+ - consider_all_requests_local should be off by default in production mode
+ - Fixed issue with secret token not being saved if DB does not exist. 
 
 
+0.12.1 - December 27, 2013
+---------------------------------------------------------------------
+- Strengthen case to generate unique secret token.
+- Ensure requests are protected.
+- Add custom serializers for xml and json.
+- Fixed sql injection in timeline method.
+- Refactor activity_user to remove possible SQL injection points.
+- Update gems to compile through
+
 Fri, Jun 28, 2013 (0.12.0)
 ---------------------------------------------------------------------
 - Ruby 1.9 support only (no ruby 1.8 and not yet ruby 2)

data/Gemfile

@@ -2,15 +2,13 @@ source 'https://rubygems.org'
 
 # Uncomment the database that you have configured in config/database.yml
 # ----------------------------------------------------------------------
-case ENV['CI'] && ENV['DB']
-when "mysql"; gem "mysql2"
-when "sqlite"; gem "sqlite3"
-when "postgres"; gem "pg"
-else
-  # gem 'mysql2'
-  # gem 'sqlite3'
-  gem 'pg'
-end
+db_drivers = {
+  "mysql" => "mysql2",
+  "sqlite" => "sqlite3",
+  "postgres" => "pg"
+}
+
+gem db_drivers[ENV['CI'] && ENV['DB']] || 'pg'
 
 # Removes a gem dependency
 def remove(name)
@@ -28,7 +26,7 @@ end
 # (See https://github.com/carlhuda/bundler/issues/1041)
 spec = Bundler.load_gemspec(File.expand_path("../fat_free_crm.gemspec", __FILE__))
 spec.runtime_dependencies.each do |dep|
-  gem dep.name, *(dep.requirement.as_list)
+  gem dep.name, *dep.requirement.as_list
 end
 
 # Remove premailer auto-require
@@ -46,8 +44,6 @@ group :development do
     gem 'capistrano-bundler'
     gem 'capistrano-rails'
     gem 'capistrano-rvm'
-    #~ gem 'capistrano-chruby'
-    #~ gem 'capistrano-rbenv'
     gem 'guard'
     gem 'guard-rspec'
     gem 'guard-rails'
@@ -63,7 +59,9 @@ group :development, :test do
   gem 'headless'
   gem 'byebug'
   gem 'pry-rails' unless ENV["CI"]
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '~> 4.7.0' # 4.8.0+ stubbed models are not allowed to access the database - User#destroyed?()
+  gem 'rubocop'
+  gem 'rainbow', '< 2.2.1' # https://github.com/fatfreecrm/fat_free_crm/issues/551
 end
 
 group :test do

data/Gemfile.lock

@@ -1,38 +1,37 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -42,22 +41,23 @@ GEM
     acts_as_fu (0.0.9)
       activerecord
       sqlite3
-    acts_as_list (0.8.2)
+    acts_as_list (0.9.2)
       activerecord (>= 3.0)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    airbrussh (1.1.1)
+    airbrussh (1.1.2)
       sshkit (>= 1.6.1, != 1.7.0)
-    arel (6.0.3)
+    arel (6.0.4)
+    ast (2.3.0)
     authlogic (3.4.6)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
       scrypt (>= 1.2, < 3.0)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (9.0.6)
-    cancancan (1.15.0)
-    capistrano (3.6.1)
+    cancancan (1.16.0)
+    capistrano (3.7.2)
       airbrussh (>= 1.0.0)
       capistrano-harrow
       i18n
@@ -67,24 +67,23 @@ GEM
       capistrano (~> 3.1)
       sshkit (~> 1.2)
     capistrano-harrow (0.5.3)
-    capistrano-rails (1.2.0)
+    capistrano-rails (1.2.2)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (2.10.2)
+    capybara (2.12.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.9)
+    childprocess (0.6.1)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.1)
@@ -95,40 +94,41 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    concurrent-ruby (1.0.2)
-    countries (2.0.4)
+    concurrent-ruby (1.0.4)
+    countries (2.0.7)
       i18n_data (~> 0.7.0)
       money (~> 6.7)
+      sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     country_select (3.0.0)
       countries (~> 2.0)
       sort_alphabetical (~> 1.0)
-    css_parser (1.4.7)
+    css_parser (1.4.8)
       addressable
     daemons (1.2.4)
     database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     dynamic_form (1.1.4)
     email_reply_parser_ffcrm (0.5.0)
     erubis (2.7.0)
-    eventmachine (1.2.1)
+    eventmachine (1.2.2)
     execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    ffaker (2.3.0)
-    ffi (1.9.14)
+    ffaker (2.5.0)
+    ffi (1.9.17)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    font-awesome-rails (4.5.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-rails (4.7.0.1)
+      railties (>= 3.2, < 5.1)
     formatador (0.2.5)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    guard (2.14.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
@@ -152,14 +152,13 @@ GEM
     i18n (0.7.0)
     i18n_data (0.7.0)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (4.2.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (1.8.3)
-    kgio (2.10.0)
+    kgio (2.11.0)
     libv8 (3.16.14.17)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -167,7 +166,7 @@ GEM
       ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.10)
+    lumberjack (1.0.11)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
@@ -177,19 +176,19 @@ GEM
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    money (6.7.1)
+    money (6.8.1)
       i18n (>= 0.6.4, <= 0.7.0)
       sixarm_ruby_unaccent (>= 1.1.1, < 2)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
-    nokogiri (1.6.8.1)
+    net-ssh (4.1.0)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    paper_trail (6.0.1)
+    paper_trail (6.0.2)
       activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     paperclip (5.1.0)
@@ -198,40 +197,43 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
     pg (0.19.0)
     polyamorous (1.3.1)
       activerecord (>= 3.0)
-    premailer (1.8.7)
-      css_parser (>= 1.4.5)
+    powerpack (0.1.1)
+    premailer (1.9.2)
+      css_parser (>= 1.4.8)
       htmlentities (>= 4.0.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rails (0.3.4)
+    pry-rails (0.3.5)
       pry (>= 0.9.10)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -246,13 +248,14 @@ GEM
       rails (> 3.1)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.1.0)
     raindrops (0.17.0)
-    rake (11.3.0)
+    rake (12.0.0)
     ransack (1.6.6)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -267,11 +270,11 @@ GEM
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     ref (2.0.0)
-    request_store (1.3.1)
-    responders (2.1.1)
+    request_store (1.3.2)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     responds_to_parent (1.1.0)
     rspec (3.5.0)
@@ -299,9 +302,16 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
-    rubyzip (1.2.0)
-    sass (3.4.22)
+    rubyzip (1.2.1)
+    sass (3.4.23)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
@@ -318,49 +328,49 @@ GEM
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     shellany (0.0.1)
-    simple_form (3.3.1)
+    simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
     sixarm_ruby_unaccent (1.1.1)
     slop (3.6.0)
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.12)
-    sshkit (1.11.4)
+    sqlite3 (1.3.13)
+    sshkit (1.12.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
+    thread_safe (0.3.6)
+    tilt (2.0.6)
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.1.3)
     unicode_utils (1.4.0)
     unicorn (5.2.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    websocket (1.2.3)
+    websocket (1.2.4)
     will_paginate (3.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    zeus (0.15.10)
+    zeus (0.15.13)
       method_source (>= 0.6.7)
 
 PLATFORMS
@@ -371,7 +381,7 @@ DEPENDENCIES
   acts_as_commentable
   acts_as_fu
   acts_as_list
-  authlogic (>= 3.4.4)
+  authlogic (>= 3.4.4, < 3.5.0)
   byebug
   cancancan
   capistrano
@@ -381,13 +391,13 @@ DEPENDENCIES
   capybara
   cocaine
   coffee-rails
-  coffee-script-source (~> 1.8.0)
+  coffee-script-source (~> 1.8, >= 1.8.0)
   country_select
   database_cleaner
   dynamic_form
   email_reply_parser_ffcrm
   execjs
-  factory_girl_rails
+  factory_girl_rails (~> 4.7.0)
   ffaker (>= 2)
   font-awesome-rails
   guard
@@ -405,13 +415,14 @@ DEPENDENCIES
   premailer
   pry-rails
   quiet_assets
-  rails (~> 4.2.0)
+  rails (~> 4.2)
   rails-observers
   rails3-jquery-autocomplete
   rails_12factor
   rails_autolink
-  ransack (~> 1.6.2)
-  ransack_ui (>= 1.3.1)
+  rainbow (< 2.2.1)
+  ransack (~> 1.6, >= 1.6.2)
+  ransack_ui (~> 1.3, >= 1.3.1)
   rb-fchange
   rb-fsevent
   rb-inotify
@@ -419,6 +430,7 @@ DEPENDENCIES
   responds_to_parent
   rspec-activemodel-mocks
   rspec-rails
+  rubocop
   sass
   sass-rails
   select2-rails
@@ -435,4 +447,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.12.5
+   1.13.7