Merge pull request #2020 from betagouv/bump-delayed-job-web

Remove delayed_job_web version lock

Gemfile

@@ -104,10 +104,7 @@ gem 'aasm'
 gem 'delayed_job_active_record'
 gem "daemons"
 gem 'delayed_cron_job'
-# FIXME: this is a fork, go back to official version
-# once https://github.com/ejschmitt/delayed_job_web/issues/101
-# has been merged and released
-gem "delayed_job_web", git: 'https://github.com/breckenedge/delayed_job_web.git', branch: 'cve_2017_12097'
+gem "delayed_job_web"
 gem 'select2-rails'
 
 # PDF Generation

Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/breckenedge/delayed_job_web.git
-  revision: 6bcb10e61ea2b9a44ffa16be8536dff46ad51449
-  branch: cve_2017_12097
-  specs:
-    delayed_job_web (1.4)
-      activerecord (> 3.0.0)
-      delayed_job (> 2.0.3)
-      sinatra (>= 1.4.4)
-
 GIT
   remote: https://github.com/hassox/warden.git
   revision: 5b3cbd5bef67cbe399bb7007537bc4841bbee772
@@ -169,6 +159,10 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
+    delayed_job_web (1.4.2)
+      activerecord (> 3.0.0)
+      delayed_job (> 2.0.3)
+      sinatra (>= 2.0.1)
     devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -803,7 +797,7 @@ DEPENDENCIES
   deep_cloneable
   delayed_cron_job
   delayed_job_active_record
-  delayed_job_web!
+  delayed_job_web
   devise
   devise-async
   dotenv-rails