From 233ed306e0e011149f0f45c6a872b9def6b776a9 Mon Sep 17 00:00:00 2001 From: pengfei Date: Tue, 13 Nov 2018 18:48:59 +0100 Subject: [PATCH 01/10] [fix #2952] page erreur 500 --- public/500.html | 99 ++++++++++------------- public/fonts/muli-bold/Muli-Regular.woff | Bin 0 -> 43636 bytes public/logo-ds.svg | 1 + 3 files changed, 44 insertions(+), 56 deletions(-) create mode 100644 public/fonts/muli-bold/Muli-Regular.woff create mode 100644 public/logo-ds.svg diff --git a/public/500.html b/public/500.html index 061abc587..94a21f21b 100644 --- a/public/500.html +++ b/public/500.html @@ -1,66 +1,53 @@ - + - We're sorry, but something went wrong (500) - + + + + + + Erreur 500 · demarches-simplifiees.fr + - - -
-
-

We're sorry, but something went wrong.

+
+
+
+
+ +
+
+
+
+

Une erreur est survenue

+
+ Nos équipes ont été averties. Si le problème persiste ou si vous voulez nous donner des détails concernant l'erreur qui vient de se produire, vous pouvez nous contacter à l'adresse contact@demarches-simplifiees.fr. +
-

If you are the application owner check the logs for more information.

diff --git a/public/fonts/muli-bold/Muli-Regular.woff b/public/fonts/muli-bold/Muli-Regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..f61ecf83245ef62d6c4a40beac2dee339734684f GIT binary patch literal 43636 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

enzuRujZ0+8*3jaG)2Rf?yii#&^q^@q7>Z~}GE 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 a-@1XNcOw&n%VyRTHU<|L02>1;5&!@W6soBJ literal 0 HcmV?d00001 diff --git a/public/logo-ds.svg b/public/logo-ds.svg new file mode 100644 index 000000000..3fb67e18a --- /dev/null +++ b/public/logo-ds.svg @@ -0,0 +1 @@ + \ No newline at end of file From 238c0c707b1fceb62e67e4a75f44c0a64e6985e3 Mon Sep 17 00:00:00 2001 From: Frederic Merizen Date: Tue, 13 Nov 2018 17:47:40 +0100 Subject: [PATCH 02/10] [#2180] Bump Carrierwave --- Gemfile.lock | 16 +++++++--------- app/uploaders/piece_justificative_uploader.rb | 4 ---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a1653a099..8362b4e05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,12 +129,10 @@ GEM capybara-selenium (0.0.6) capybara selenium-webdriver - carrierwave (0.11.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.2.3) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - mimemagic (>= 0.3.0) carrierwave-i18n (0.2.0) case_transform (0.2) activesupport @@ -151,7 +149,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) copy_carrierwave_file (1.3.0) carrierwave (>= 0.9) crack (0.4.3) @@ -483,9 +481,9 @@ GEM marcel (0.3.2) mimemagic (~> 0.3.2) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.2) mini_mime (1.0.1) mini_portile2 (2.3.0) @@ -900,4 +898,4 @@ DEPENDENCIES zxcvbn-ruby BUNDLED WITH - 1.16.6 + 1.17.1 diff --git a/app/uploaders/piece_justificative_uploader.rb b/app/uploaders/piece_justificative_uploader.rb index 83d277c8f..f4fb1ce67 100644 --- a/app/uploaders/piece_justificative_uploader.rb +++ b/app/uploaders/piece_justificative_uploader.rb @@ -33,10 +33,6 @@ class PieceJustificativeUploader < BaseUploader filename end - def original_filename - model.original_filename - end - private def secure_token From 6da33f2387bbcea626a9ad8967cd6d05c25acb09 Mon Sep 17 00:00:00 2001 From: Frederic Merizen Date: Tue, 13 Nov 2018 17:51:13 +0100 Subject: [PATCH 03/10] [#2180] Drop fog --- Gemfile | 1 - Gemfile.lock | 155 ----------------------------- config/initializers/carrierwave.rb | 2 + 3 files changed, 2 insertions(+), 156 deletions(-) diff --git a/Gemfile b/Gemfile index 3b09033c4..ef21b8b60 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,6 @@ gem 'clamav-client', require: 'clamav/client' gem 'carrierwave' gem 'carrierwave-i18n' gem 'copy_carrierwave_file' -gem 'fog' gem 'fog-openstack' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 8362b4e05..13c97e520 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,6 @@ GIT GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) aasm (5.0.1) concurrent-ruby (~> 1.0) actioncable (5.2.1) @@ -212,161 +211,19 @@ GEM faraday (0.12.2) multipart-post (>= 1.2, < 3) ffi (1.9.25) - fission (0.5.0) - CFPropertyList (~> 2.2) flipflop (2.4.0) activesupport (>= 4.0) - fog (1.42.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.45) - fog-digitalocean (>= 0.3.0) - fog-dnsimple (~> 1.0) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-internet-archive - fog-joyent - fog-json - fog-local - fog-openstack - fog-ovirt - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-rackspace - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-vsphere (>= 0.4.0) - fog-xenserver - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - json (~> 2.0) - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (2.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-brightbox (0.14.0) - fog-core (~> 1.22) - fog-json - inflecto (~> 0.0.2) - fog-cloudatcost (0.1.2) - fog-core (~> 1.36) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (1.45.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-digitalocean (0.3.0) - fog-core (~> 1.42) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.5) - fog-dnsimple (1.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-dynect (0.0.3) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) - fog-core - fog-json - fog-xml - fog-internet-archive (0.0.1) - fog-core - fog-json - fog-xml - fog-joyent (0.0.1) - fog-core (~> 1.42) - fog-json (>= 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.27) fog-core (~> 1.45.0) fog-json (>= 1.0) ipaddress (>= 0.8) - fog-ovirt (0.1.3) - fog-core (~> 1.45) - fog-json - fog-xml (~> 0.1.1) - rbovirt (~> 0.1.5) - fog-powerdns (0.1.1) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-profitbricks (4.1.1) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.5) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-radosgw (0.0.5) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.7.5) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (1.1.4) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-vsphere (1.13.1) - fog-core - rbvmomi (~> 1.9) - fog-xenserver (0.3.0) - fog-core - fog-xml - fog-xml (0.1.3) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) font-awesome-rails (4.7.0.4) railties (>= 3.2, < 6.0) formatador (0.2.5) @@ -424,7 +281,6 @@ GEM httpclient (2.8.3) i18n (1.1.1) concurrent-ruby (~> 1.0) - inflecto (0.0.2) ipaddress (0.8.3) jaro_winkler (1.5.1) jquery-rails (4.3.3) @@ -615,14 +471,6 @@ GEM ffi rbnacl-libsodium (1.0.16) rbnacl (>= 3.0.1) - rbovirt (0.1.5) - nokogiri - rest-client (> 1.7.0) - rbvmomi (1.11.6) - builder (~> 3.0) - json (>= 1.8) - nokogiri (~> 1.5) - trollop (~> 2.1) request_store (1.4.1) rack (>= 1.4) responders (2.4.0) @@ -750,7 +598,6 @@ GEM thread_safe (0.3.6) tilt (2.0.8) timecop (0.9.1) - trollop (2.1.2) ttfunk (1.5.1) turbolinks (5.2.0) turbolinks-source (~> 5.2) @@ -789,7 +636,6 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xml-simple (1.1.5) xpath (3.0.0) nokogiri (~> 1.8) xray-rails (0.3.1) @@ -834,7 +680,6 @@ DEPENDENCIES draper factory_bot flipflop - fog fog-openstack font-awesome-rails groupdate diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index a3dd7d654..d267f6f64 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -4,6 +4,8 @@ CarrierWave.configure do |config| config.permissions = 0664 config.directory_permissions = 0775 + config.fog_provider = 'fog/openstack' + if ENV['FOG_ENABLED'] == 'enabled' config.fog_credentials = { provider: 'OpenStack', From d901cb286bb2870c3918f19bf6f892722846fa76 Mon Sep 17 00:00:00 2001 From: Frederic Merizen Date: Tue, 13 Nov 2018 18:25:06 +0100 Subject: [PATCH 04/10] [#2180] Bump fog-openstack --- Gemfile.lock | 7 ++++--- config/env.example | 3 ++- config/initializers/carrierwave.rb | 20 +++++++++++++++++++- config/secrets.yml | 3 ++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 13c97e520..2901189f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,15 +213,16 @@ GEM ffi (1.9.25) flipflop (2.4.0) activesupport (>= 4.0) - fog-core (1.45.0) + fog-core (2.1.2) builder excon (~> 0.58) formatador (~> 0.2) + mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (0.1.27) - fog-core (~> 1.45.0) + fog-openstack (1.0.6) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) font-awesome-rails (4.7.0.4) diff --git a/config/env.example b/config/env.example index 815202e99..fdfef28c6 100644 --- a/config/env.example +++ b/config/env.example @@ -18,7 +18,8 @@ BASIC_AUTH_PASSWORD="" FOG_OPENSTACK_TENANT="" FOG_OPENSTACK_API_KEY="" FOG_OPENSTACK_USERNAME="" -FOG_OPENSTACK_AUTH_URL="" +FOG_OPENSTACK_URL="" +FOG_OPENSTACK_IDENTITY_API_VERSION="" FOG_OPENSTACK_REGION="" FOG_DIRECTORY="" FOG_ENABLED="" diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index d267f6f64..73298442a 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -1,3 +1,20 @@ +module Fog + module ServicesMixin + private + + def require_service_provider_library(service, provider) + # Monkey patch to fix https://github.com/fog/fog/issues/4014 + + # This method exists in fog to load legacy providers that have not yet been extracted to + # their own gem. + # fog-openstack has been extracted to its own gem and does not need this method. + # Furthermore, fog-openstack has recently been refactored in a way that breaks this method. + # + # Therefore, until either fog or fog-openstack fixes the problem, we have to neuter the method. + end + end +end + CarrierWave.configure do |config| # These permissions will make dir and files available only to the user running # the servers @@ -13,7 +30,8 @@ CarrierWave.configure do |config| openstack_api_key: Rails.application.secrets.fog[:openstack_api_key], openstack_username: Rails.application.secrets.fog[:openstack_username], openstack_auth_url: Rails.application.secrets.fog[:openstack_auth_url], - openstack_region: Rails.application.secrets.fog[:openstack_region] + openstack_region: Rails.application.secrets.fog[:openstack_region], + openstack_identity_api_version: Rails.application.secrets.fog[:oopenstack_identity_api_version] } end diff --git a/config/secrets.yml b/config/secrets.yml index 5c4ad5598..ab96f8c0b 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -37,7 +37,8 @@ defaults: &defaults openstack_tenant: <%= ENV['FOG_OPENSTACK_TENANT'] %> openstack_api_key: <%= ENV['FOG_OPENSTACK_API_KEY'] %> openstack_username: <%= ENV['FOG_OPENSTACK_USERNAME'] %> - openstack_auth_url: <%= ENV['FOG_OPENSTACK_AUTH_URL'] %> + openstack_auth_url: <%= ENV['FOG_OPENSTACK_URL'] %> + openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>" openstack_region: <%= ENV['FOG_OPENSTACK_REGION'] %> directory: <%= ENV['FOG_DIRECTORY'] %> carrierwave: From e69e459649107bd66425637ebd99f9c5a09f50a3 Mon Sep 17 00:00:00 2001 From: Frederic Merizen Date: Wed, 14 Nov 2018 15:42:09 +0100 Subject: [PATCH 05/10] [#2180] Add activestorage-openstack --- Gemfile | 1 + Gemfile.lock | 12 ++++++++++++ config/storage.yml | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/Gemfile b/Gemfile index ef21b8b60..ad4e18781 100644 --- a/Gemfile +++ b/Gemfile @@ -56,6 +56,7 @@ gem 'carrierwave' gem 'carrierwave-i18n' gem 'copy_carrierwave_file' gem 'fog-openstack' +gem 'activestorage-openstack', git: 'https://github.com/fredZen/activestorage-openstack.git', branch: 'frederic/bump-fog-openstack' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 2901189f9..4c3991cac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,14 @@ +GIT + remote: https://github.com/fredZen/activestorage-openstack.git + revision: 8b64c113223e9ec431b220c9350866c4147b88c3 + branch: frederic/bump-fog-openstack + specs: + activestorage-openstack (0.5.0) + fog-openstack (~> 1.0) + marcel + mime-types + rails (~> 5.2.0) + GIT remote: https://github.com/hassox/warden.git revision: 5b3cbd5bef67cbe399bb7007537bc4841bbee772 @@ -650,6 +661,7 @@ DEPENDENCIES aasm active_link_to active_model_serializers + activestorage-openstack! administrate after_party axlsx (~> 3.0.0.pre) diff --git a/config/storage.yml b/config/storage.yml index 80f0cf275..f3370122c 100644 --- a/config/storage.yml +++ b/config/storage.yml @@ -9,3 +9,14 @@ clever_cloud: access_key_id: <%= ENV['CLEVER_CLOUD_ACCESS_KEY_ID'] %> secret_access_key: <%= ENV['CLEVER_CLOUD_SECRET_ACCESS_KEY'] %> bucket: <%= ENV['CLEVER_CLOUD_BUCKET'] %> +openstack: + service: OpenStack + container: "<%= ENV['FOG_DIRECTORY'] %>" + credentials: + openstack_tenant: "<%= ENV['FOG_OPENSTACK_TENANT'] %>" + openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>" + openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>" + openstack_auth_url: "<%= ENV['FOG_OPENSTACK_URL'] %>" + openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>" + openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>" + openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>" From 7b98bfb0254542c9fbf37b0c99b62250dcdbe1e2 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Fri, 16 Nov 2018 11:46:38 +0100 Subject: [PATCH 06/10] Bump default gems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - active_model_serializers (0.10.7 → 0.10.8) - groupdate (4.0.2 → 4.1.0) - rails-i18n (5.1.1 → 5.1.2) - skylight (3.0.0 → 3.1.1) - typhoeus (1.3.0 → 1.3.1) --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4c3991cac..13200b72b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM active_link_to (1.0.5) actionpack addressable - active_model_serializers (0.10.7) + active_model_serializers (0.10.8) actionpack (>= 4.1, < 6) activemodel (>= 4.1, < 6) case_transform (>= 0.2) @@ -241,7 +241,7 @@ GEM formatador (0.2.5) globalid (0.4.1) activesupport (>= 4.2.0) - groupdate (4.0.2) + groupdate (4.1.0) activesupport (>= 4.2) guard (2.14.2) formatador (>= 0.2.4) @@ -348,7 +348,7 @@ GEM rest-client marcel (0.3.2) mimemagic (~> 0.3.2) - method_source (0.9.0) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) @@ -426,7 +426,7 @@ GEM pry (~> 0.10) public_suffix (3.0.2) puma (3.12.0) - rack (2.0.5) + rack (2.0.6) rack-handlers (0.7.3) rack rack-mini-profiler (1.0.0) @@ -465,7 +465,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.1) + rails-i18n (5.1.2) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) railties (5.2.1) @@ -576,9 +576,9 @@ GEM rack (~> 2.0) rack-protection (= 2.0.3) tilt (~> 2.0) - skylight (3.0.0) - skylight-core (= 3.0.0) - skylight-core (3.0.0) + skylight (3.1.1) + skylight-core (= 3.1.1) + skylight-core (3.1.1) activesupport (>= 4.2.0) smart_listing (1.2.2) coffee-rails @@ -606,7 +606,7 @@ GEM httpclient (>= 2.4) sysexits (1.2.0) temple (0.8.0) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) timecop (0.9.1) @@ -614,7 +614,7 @@ GEM turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - typhoeus (1.3.0) + typhoeus (1.3.1) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) From dcf063f8f8955018de39e9d7c655a9f9a0997747 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Fri, 16 Nov 2018 11:48:36 +0100 Subject: [PATCH 07/10] Bump warden and remove its dependency on the master branch Now that the fix for wardencommunity/warden#147 is present in a proper release --- Gemfile | 2 +- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index ad4e18781..791180e2c 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'turbolinks' # Enable deep clone of active record models gem 'deep_cloneable' -gem 'warden', git: 'https://github.com/hassox/warden.git', branch: 'master' +gem 'warden' # Use Puma as the app server gem 'puma' diff --git a/Gemfile.lock b/Gemfile.lock index 13200b72b..0cc53bae8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,14 +9,6 @@ GIT mime-types rails (~> 5.2.0) -GIT - remote: https://github.com/hassox/warden.git - revision: 5b3cbd5bef67cbe399bb7007537bc4841bbee772 - branch: master - specs: - warden (1.2.8) - rack (>= 1.0) - GIT remote: https://github.com/mina-deploy/mina.git revision: 0dd5fdb8bb82a180d35e1fc033de2fac48257e30 @@ -629,6 +621,8 @@ GEM activemodel (>= 3.0.0) addressable vcr (4.0.0) + warden (1.2.8) + rack (>= 2.0.6) web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) @@ -748,7 +742,7 @@ DEPENDENCIES turbolinks typhoeus vcr - warden! + warden web-console webmock webpacker (>= 4.0.x) From 6479de1f6c870f933f693ed2ae2a481bb1363cc1 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Fri, 16 Nov 2018 11:51:25 +0100 Subject: [PATCH 08/10] Bump development gems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - rubocop (0.59.2 → 0.60.0) --- .rubocop.yml | 3 +++ Gemfile.lock | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 44cb2a0e4..8a4435dc8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -84,8 +84,11 @@ Layout/EmptyLines: Layout/EmptyLineAfterGuardClause: Enabled: false +# FIXME: private should not be a column name on TypeDeChamp Layout/EmptyLinesAroundAccessModifier: Enabled: true + Exclude: + - "spec/factories/type_de_champ.rb" Layout/EmptyLinesAroundArguments: Enabled: true diff --git a/Gemfile.lock b/Gemfile.lock index 0cc53bae8..f77c3e60c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM json orm_adapter (0.5.0) parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) pdf-core (0.7.0) pg (1.1.3) @@ -514,14 +514,14 @@ GEM rspec-support (3.8.0) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.59.2) + rubocop (0.60.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (~> 1.4.0) rubocop-rspec-focused (1.0.0) rubocop (>= 0.51) ruby-progressbar (1.10.0) From f7225b00861a014b7b9650239b9abf2cb318e994 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Fri, 16 Nov 2018 11:53:36 +0100 Subject: [PATCH 09/10] Bump development/test gems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - rspec-rails (3.8.0 → 3.8.1) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f77c3e60c..6d2d10aa7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -497,13 +497,13 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.0) + rspec-rails (3.8.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) From c55ae7993095813fbda82837199e6025f20e16d6 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Fri, 16 Nov 2018 11:53:59 +0100 Subject: [PATCH 10/10] Bump test gems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - guard (2.14.2 → 2.15.0) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6d2d10aa7..80ace7c9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,7 @@ GEM activesupport (>= 4.2.0) groupdate (4.1.0) activesupport (>= 4.2) - guard (2.14.2) + guard (2.15.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -410,7 +410,7 @@ GEM premailer-rails (1.10.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - pry (0.11.3) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-byebug (3.6.0)