Merge pull request #1335 from Growstuff/dev

Release 25
Growstuff · May 15, 2017 · 1ad171f · 1ad171f
2 parents 812a6f5 + 06896da
commit 1ad171f
Show file tree

Hide file tree

Showing 12 changed files with 232 additions and 231 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -68,7 +68,6 @@ Rails/OutputSafety:
 # update_counters
 Rails/SkipsModelValidations:
   Exclude:
-    - 'app/controllers/plantings_controller.rb'
     - 'db/seeds.rb'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -228,10 +227,6 @@ Style/NegatedIf:
   Exclude:
     - 'app/helpers/crops_helper.rb'
 
-Style/NestedTernaryOperator:
-  Exclude:
-    - 'app/controllers/plantings_controller.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 # SupportedStyles: skip_modifier_ifs, always

diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem 'rails', '~> 4.2.7'
 gem 'bundler', '>=1.1.5'
 
 gem 'coffee-rails', '~> 4.1.0'
-gem 'haml'
+gem 'haml', '~> 4.0.7'
 gem 'sass-rails', '~> 5.0.4'
 
 # CSS framework
@@ -85,8 +85,8 @@ gem "hashie", ">= 3.5.3"
 
 gem 'rake', '>= 10.0.0'
 
-# # CMS
-# gem 'comfortable_mexican_sofa', '~> 1.12.0'
+# locale based flash notices for controllers
+gem "responders"
 
 group :production, :staging do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,8 +31,8 @@ GEM
     activejob (4.2.8)
       activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemerchant (1.64.0)
-      activesupport (>= 3.2.14, < 5.1)
+    activemerchant (1.66.0)
+      activesupport (>= 3.2.14, < 6.x)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
@@ -52,7 +52,7 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.4)
     ast (2.3.0)
-    autoprefixer-rails (6.7.7.2)
+    autoprefixer-rails (7.0.1)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -80,7 +80,7 @@ GEM
       uniform_notifier (~> 1.10.0)
     byebug (9.0.6)
     cancancan (1.16.0)
-    capybara (2.13.0)
+    capybara (2.14.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -93,9 +93,9 @@ GEM
     capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    childprocess (0.6.3)
+    childprocess (0.7.0)
       ffi (~> 1.0, >= 1.0.11)
-    climate_control (0.1.0)
+    climate_control (0.2.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -140,7 +140,7 @@ GEM
       railties (>= 3.1)
     dalli (2.7.6)
     database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     devise (4.2.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -216,13 +216,13 @@ GEM
       highline
       tilt
       trollop (= 1.16.2)
-    haml-rails (0.9.0)
+    haml-rails (1.0.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 4.0.6, < 5.0)
+      haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    haml_lint (0.24.0)
+    haml_lint (0.25.1)
       haml (>= 4.0, < 5.1)
       rainbow
       rake (>= 10, < 13)
@@ -233,12 +233,12 @@ GEM
       excon (~> 0.45)
       multi_json (~> 1.8)
     highline (1.7.8)
-    html2haml (2.1.0)
+    html2haml (2.2.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0)
+      haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.14.0)
+    httparty (0.15.2)
       multi_xml (>= 0.5.2)
     i18n (0.8.1)
     i18n-tasks (0.9.12)
@@ -251,12 +251,12 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    jasmine (2.5.2)
-      jasmine-core (>= 2.5.1, < 3.0.0)
+    jasmine (2.6.0)
+      jasmine-core (>= 2.6.0, < 3.0.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.5.2)
+    jasmine-core (2.6.1)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -286,8 +286,8 @@ GEM
       ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.11)
-    mail (2.6.4)
+    lumberjack (1.0.12)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     memcachier (0.0.2)
     method_source (0.8.2)
@@ -296,13 +296,13 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     multi_json (1.11.3)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
     newrelic_rpm (4.1.0.333)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -344,7 +344,7 @@ GEM
     phantomjs (2.1.1.0)
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    poltergeist (1.14.0)
+    poltergeist (1.15.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -356,8 +356,8 @@ GEM
     public_suffix (2.0.5)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.5)
-    rack-protection (1.5.3)
+    rack (1.6.6)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -400,33 +400,34 @@ GEM
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     redis (3.3.3)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
     rspec-activemodel-mocks (1.0.3)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -452,11 +453,11 @@ GEM
       websocket (~> 1.0)
     sexp_processor (4.9.0)
     shellany (0.0.1)
-    sidekiq (4.2.10)
+    sidekiq (5.0.0)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
+      redis (~> 3.3, >= 3.3.3)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -550,7 +551,7 @@ DEPENDENCIES
   gravatar-ultimate
   guard
   guard-rspec
-  haml
+  haml (~> 4.0.7)
   haml-i18n-extractor
   haml-rails
   haml_lint
@@ -579,6 +580,7 @@ DEPENDENCIES
   rails_12factor
   rainbow (< 2.2.0)
   rake (>= 10.0.0)
+  responders
   rspec-activemodel-mocks
   rspec-rails
   rubocop (<= 0.47.1)
@@ -592,6 +594,7 @@ DEPENDENCIES
   webrat
   will_paginate (~> 3.0)
 
+
 RUBY VERSION
    ruby 2.3.4p301