diff --git a/.rubocop.yml b/.rubocop.yml index 8007fd868..354ef3d74 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -661,6 +661,9 @@ Rails/ApplicationRecord: Rails/Blank: Enabled: true +Rails/BulkChangeTable: + Enabled: false + Rails/CreateTableWithTimestamps: Enabled: false @@ -792,6 +795,9 @@ Security/Open: Security/YAMLLoad: Enabled: true +Style/AccessModifierDeclarations: + Enabled: false + Style/Alias: Enabled: false diff --git a/Gemfile.lock b/Gemfile.lock index e2eae1d09..7434d95f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM sass-rails (~> 5.0) selectize-rails (~> 0.6) aes_key_wrap (1.0.1) - apipie-rails (0.5.8) + apipie-rails (0.5.9) rails (>= 4.1) arel (9.0.0) ast (2.4.0) @@ -107,7 +107,7 @@ GEM sass (>= 3.3.4) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) - brakeman (4.3.0) + brakeman (4.3.1) browser (2.5.3) builder (3.2.3) byebug (10.0.2) @@ -133,7 +133,7 @@ GEM carrierwave-i18n (0.2.0) case_transform (0.2) activesupport - chartkick (2.3.4) + chartkick (2.3.5) childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.10) @@ -167,10 +167,11 @@ GEM delayed_job_active_record (4.1.3) activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) - delayed_job_web (1.4.2) + delayed_job_web (1.4.3) activerecord (> 3.0.0) delayed_job (> 2.0.3) - sinatra (>= 2.0.1) + rack-protection (>= 1.5.5) + sinatra (>= 1.4.4) devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -183,9 +184,9 @@ GEM diff-lcs (1.3) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - dotenv (2.4.0) - dotenv-rails (2.4.0) - dotenv (= 2.4.0) + dotenv (2.5.0) + dotenv-rails (2.5.0) + dotenv (= 2.5.0) railties (>= 3.2, < 6.0) draper (3.0.1) actionpack (~> 5.0) @@ -201,9 +202,9 @@ GEM ethon (0.11.0) ffi (>= 1.3.0) eventmachine (1.2.7) - excon (0.60.0) + excon (0.62.0) execjs (2.7.0) - factory_bot (4.8.2) + factory_bot (4.10.0) activesupport (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -299,13 +300,13 @@ GEM fog-joyent (0.0.1) fog-core (~> 1.42) fog-json (>= 1.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) fog-local (0.4.0) fog-core (~> 1.27) - fog-openstack (0.1.24) - fog-core (~> 1.40) + fog-openstack (0.1.27) + fog-core (~> 1.45.0) fog-json (>= 1.0) ipaddress (>= 0.8) fog-ovirt (0.1.3) @@ -420,6 +421,7 @@ GEM concurrent-ruby (~> 1.0) inflecto (0.0.2) ipaddress (0.8.3) + jaro_winkler (1.5.1) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -490,7 +492,7 @@ GEM nenv (0.3.0) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) notiffany (0.1.1) nenv (~> 0.1) @@ -521,15 +523,15 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openstack (3.3.18) + openstack (3.3.20) json orm_adapter (0.5.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) pdf-core (0.7.0) pg (1.0.0) - powerpack (0.1.1) + powerpack (0.1.2) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -561,7 +563,7 @@ GEM httpclient json-jwt (>= 1.9.0) rack - rack-protection (2.0.2) + rack-protection (2.0.3) rack rack-test (1.0.0) rack (>= 1.0, < 3) @@ -649,11 +651,12 @@ GEM rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) - rspec_junit_formatter (0.3.0) + rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.56.0) + rubocop (0.58.1) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) @@ -690,23 +693,23 @@ GEM selenium-webdriver (3.8.0) childprocess (~> 0.5) rubyzip (~> 1.0) - sentry-raven (2.7.3) + sentry-raven (2.7.4) faraday (>= 0.7.6, < 1.0) sexp_processor (4.11.0) shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - simple_form (4.0.0) - actionpack (> 4) - activemodel (> 4) - sinatra (2.0.2) + simple_form (4.0.1) + actionpack (>= 5.0) + activemodel (>= 5.0) + sinatra (2.0.3) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.2) + rack-protection (= 2.0.3) tilt (~> 2.0) - skylight (2.0.1) - skylight-core (= 2.0.1) - skylight-core (2.0.1) + skylight (2.0.2) + skylight-core (= 2.0.2) + skylight-core (2.0.2) activesupport (>= 4.2.0) smart_listing (1.2.2) coffee-rails @@ -749,12 +752,12 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.10) + uglifier (4.1.15) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.2) + unicode-display_width (1.4.0) unicorn (5.4.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -773,7 +776,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.4.1) + webmock (3.4.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff diff --git a/app/controllers/new_gestionnaire/procedures_controller.rb b/app/controllers/new_gestionnaire/procedures_controller.rb index d9584e5e0..48d53cdb3 100644 --- a/app/controllers/new_gestionnaire/procedures_controller.rb +++ b/app/controllers/new_gestionnaire/procedures_controller.rb @@ -356,7 +356,7 @@ module NewGestionnaire def last_page? current_page == total_pages end -EVAL + EVAL end end end