good_job 3.30.1 → 4.0.0

data/app/models/good_job/discrete_execution.rb

@@ -14,31 +14,6 @@ module GoodJob # :nodoc:
 
     alias_attribute :performed_at, :created_at
 
-    def self.error_event_migrated?
-      return true if columns_hash["error_event"].present?
-
-      migration_pending_warning!
-      false
-    end
-
-    def self.backtrace_migrated?
-      return true if columns_hash["error_backtrace"].present?
-
-      migration_pending_warning!
-      false
-    end
-
-    def self.duration_interval_migrated?
-      return true if columns_hash["duration"].present?
-
-      migration_pending_warning!
-      false
-    end
-
-    def self.duration_interval_usable?
-      duration_interval_migrated? && Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0.a')
-    end
-
     def number
       serialized_params.fetch('executions', 0) + 1
     end
@@ -50,12 +25,7 @@ module GoodJob # :nodoc:
 
     # Monotonic time between when this job started and finished
     def runtime_latency
-      # migrated and Rails greater than 6.1
-      if self.class.duration_interval_usable?
-        duration
-      elsif performed_at
-        (finished_at || Time.current) - performed_at
-      end
+      duration
     end
 
     def last_status_at

data/app/models/good_job/execution.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 module GoodJob
-  # Active Record model that represents an +ActiveJob+ job.
-  # Most behavior is currently in BaseExecution in anticipation of
-  # moving behavior into +GoodJob::Job+.
-  class Execution < BaseExecution
-    self.table_name = 'good_jobs'
-
-    belongs_to :job, class_name: 'GoodJob::Job', foreign_key: 'active_job_id', primary_key: 'active_job_id', optional: true, inverse_of: :executions
+  # Created at the time a Job begins executing.
+  # Behavior from +DiscreteExecution+ will be merged into this class.
+  class Execution < DiscreteExecution
   end
 end

data/app/models/good_job/job.rb

@@ -2,10 +2,6 @@
 
 module GoodJob
   # Active Record model that represents an +ActiveJob+ job.
-  # There is not a table in the database whose discrete rows represents "Jobs".
-  # The +good_jobs+ table is a table of individual {GoodJob::Execution}s that share the same +active_job_id+.
-  # A single row from the +good_jobs+ table of executions is fetched to represent a Job.
-  #
   class Job < BaseExecution
     # Raised when an inappropriate action is applied to a Job based on its state.
     ActionForStateMismatchError = Class.new(StandardError)
@@ -16,29 +12,17 @@ module GoodJob
     # Raised when Active Job data cannot be deserialized
     ActiveJobDeserializationError = Class.new(StandardError)
 
-    class << self
-      delegate :table_name, to: GoodJob::Execution
-
-      def table_name=(_value)
-        raise NotImplementedError, 'Assign GoodJob::Execution.table_name directly'
-      end
-    end
-
-    self.primary_key = 'active_job_id'
-    self.advisory_lockable_column = 'active_job_id'
+    self.table_name = 'good_jobs'
+    self.advisory_lockable_column = 'id'
     self.implicit_order_column = 'created_at'
 
     belongs_to :batch, class_name: 'GoodJob::BatchRecord', inverse_of: :jobs, optional: true
     belongs_to :locked_by_process, class_name: "GoodJob::Process", foreign_key: :locked_by_id, inverse_of: :locked_jobs, optional: true
-    has_many :executions, -> { order(created_at: :asc) }, class_name: 'GoodJob::Execution', foreign_key: 'active_job_id', inverse_of: :job # rubocop:disable Rails/HasManyOrHasOneDependent
-    has_many :discrete_executions, -> { order(created_at: :asc) }, class_name: 'GoodJob::DiscreteExecution', foreign_key: 'active_job_id', primary_key: :active_job_id, inverse_of: :job # rubocop:disable Rails/HasManyOrHasOneDependent
+    has_many :executions, -> { order(created_at: :asc) }, class_name: 'GoodJob::Execution', foreign_key: 'active_job_id', primary_key: :active_job_id, inverse_of: :job, dependent: :delete_all
+    # TODO: rename callers of discrete_execution to executions, but after v4 has some time to bake for cleaner diffs/patches
+    has_many :discrete_executions, -> { order(created_at: :asc) }, class_name: 'GoodJob::Execution', foreign_key: 'active_job_id', primary_key: :active_job_id, inverse_of: :job, dependent: :delete_all
 
-    after_destroy lambda {
-      GoodJob::DiscreteExecution.where(active_job_id: active_job_id).delete_all if discrete? # TODO: move into association `dependent: :delete_all` after v4
-    }
-
-    # Only the most-recent unretried execution represents a "Job"
-    default_scope { where(retried_good_job_id: nil) }
+    before_create -> { self.id = active_job_id }, if: -> { active_job_id.present? }
 
     # Get Jobs finished before the given timestamp.
     # @!method finished_before(timestamp)
@@ -64,65 +48,11 @@ module GoodJob
 
     scope :unfinished_undiscrete, -> { where(finished_at: nil, retried_good_job_id: nil, is_discrete: [nil, false]) }
 
-    # The job's Active Job UUID
-    # @return [String]
-    def id
-      active_job_id
-    end
-
-    # Override #reload to add a custom scope to ensure the reloaded record is the head execution
-    # @return [Job]
-    def reload(options = nil)
-      self.class.connection.clear_query_cache
-
-      # override with the `where(retried_good_job_id: nil)` scope
-      override_query = self.class.where(retried_good_job_id: nil)
-      fresh_object =
-        if options && options[:lock]
-          self.class.unscoped { override_query.lock(options[:lock]).find(id) }
-        else
-          self.class.unscoped { override_query.find(id) }
-        end
-
-      @attributes = fresh_object.instance_variable_get(:@attributes)
-      @new_record = false
-      @previously_new_record = false
-      self
-    end
-
-    # This job's most recent {Execution}
-    # @param reload [Booelan] whether to reload executions
-    # @return [Execution]
-    def head_execution(reload: false)
-      executions.reload if reload
-      executions.load # memoize the results
-      executions.last
-    end
-
-    # This job's initial/oldest {Execution}
-    # @return [Execution]
-    def tail_execution
-      executions.first
-    end
-
-    # The number of times this job has been executed, according to Active Job's serialized state.
-    # @return [Numeric]
-    def executions_count
-      aj_count = serialized_params.fetch('executions', 0)
-      # The execution count within serialized_params is not updated
-      # once the underlying execution has been executed.
-      if status.in? [:discarded, :succeeded, :running]
-        aj_count + 1
-      else
-        aj_count
-      end
-    end
-
-    # The number of times this job has been executed, according to the number of GoodJob {Execution} records.
-    # @return [Numeric]
-    def preserved_executions_count
-      executions.size
-    end
+    # TODO: it would be nice to enforce these values at the model
+    # validates :active_job_id, presence: true
+    # validates :scheduled_at, presence: true
+    # validates :job_class, presence: true
+    # validates :error_event, presence: true, if: -> { error.present? }
 
     # The most recent error message.
     # If the job has been retried, the error will be fetched from the previous {Execution} record.
@@ -155,6 +85,10 @@ module GoodJob
       job_class
     end
 
+    def executions_count
+      super || 0
+    end
+
     # Tests whether the job is being executed right now.
     # @return [Boolean]
     def running?
@@ -189,33 +123,33 @@ module GoodJob
     # @return [ActiveJob::Base]
     def retry_job
       with_advisory_lock do
-        execution = head_execution(reload: true)
-        active_job = execution.active_job(ignore_deserialization_errors: true)
+        reload
+        active_job = self.active_job(ignore_deserialization_errors: true)
 
         raise ActiveJobDeserializationError if active_job.nil?
         raise AdapterNotGoodJobError unless active_job.class.queue_adapter.is_a? GoodJob::Adapter
-        raise ActionForStateMismatchError if execution.finished_at.blank? || execution.error.blank?
+        raise ActionForStateMismatchError if finished_at.blank? || error.blank?
 
         # Update the executions count because the previous execution will not have been preserved
         # Do not update `exception_executions` because that comes from rescue_from's arguments
         active_job.executions = (active_job.executions || 0) + 1
 
         begin
-          error_class, error_message = execution.error.split(ERROR_MESSAGE_SEPARATOR).map(&:strip)
+          error_class, error_message = error.split(ERROR_MESSAGE_SEPARATOR).map(&:strip)
           error = error_class.constantize.new(error_message)
         rescue StandardError
-          error = StandardError.new(execution.error)
+          error = StandardError.new(error)
         end
 
         new_active_job = nil
         GoodJob::CurrentThread.within do |current_thread|
-          current_thread.execution = execution
+          current_thread.job = self
           current_thread.retry_now = true
 
-          execution.class.transaction(joinable: false, requires_new: true) do
+          self.class.transaction(joinable: false, requires_new: true) do
             new_active_job = active_job.retry_job(wait: 0, error: error)
-            execution.error_event = ERROR_EVENT_RETRIED if execution.error && execution.class.error_event_migrated?
-            execution.save!
+            self.error_event = ERROR_EVENT_RETRIED if error
+            save!
           end
         end
 
@@ -244,11 +178,10 @@ module GoodJob
     # @return [void]
     def reschedule_job(scheduled_at = Time.current)
       with_advisory_lock do
-        execution = head_execution(reload: true)
-
-        raise ActionForStateMismatchError if execution.finished_at.present?
+        reload
+        raise ActionForStateMismatchError if finished_at.present?
 
-        execution.update(scheduled_at: scheduled_at)
+        update(scheduled_at: scheduled_at)
       end
     end
 
@@ -256,9 +189,7 @@ module GoodJob
     # @return [void]
     def destroy_job
       with_advisory_lock do
-        execution = head_execution(reload: true)
-
-        raise ActionForStateMismatchError if execution.finished_at.blank?
+        raise ActionForStateMismatchError if finished_at.blank?
 
         destroy
       end
@@ -270,37 +201,27 @@ module GoodJob
       attributes['id']
     end
 
-    # Utility method to test whether this job's underlying attributes represents its most recent execution.
-    # @return [Boolean]
-    def _head?
-      _execution_id == head_execution(reload: true).id
-    end
-
     private
 
     def _discard_job(message)
-      execution = head_execution(reload: true)
-      active_job = execution.active_job(ignore_deserialization_errors: true)
+      active_job = self.active_job(ignore_deserialization_errors: true)
 
-      raise ActionForStateMismatchError if execution.finished_at.present?
+      raise ActionForStateMismatchError if finished_at.present?
 
       job_error = GoodJob::Job::DiscardJobError.new(message)
 
-      update_execution = proc do
-        execution.update(
-          {
-            finished_at: Time.current,
-            error: GoodJob::Execution.format_error(job_error),
-          }.tap do |attrs|
-            attrs[:error_event] = ERROR_EVENT_DISCARDED if self.class.error_event_migrated?
-          end
+      update_record = proc do
+        update(
+          finished_at: Time.current,
+          error: self.class.format_error(job_error),
+          error_event: ERROR_EVENT_DISCARDED
         )
       end
 
       if active_job.respond_to?(:instrument)
-        active_job.send :instrument, :discard, error: job_error, &update_execution
+        active_job.send :instrument, :discard, error: job_error, &update_record
       else
-        update_execution.call
+        update_record.call
       end
     end
   end

data/app/models/good_job/process.rb

@@ -33,13 +33,9 @@ module GoodJob # :nodoc:
     # @!scope class
     # @return [ActiveRecord::Relation]
     scope :active, (lambda do
-      if lock_type_migrated?
-        query = joins_advisory_locks
-        query.where(lock_type: LOCK_TYPE_ENUMS[LOCK_TYPE_ADVISORY]).advisory_locked
-          .or(query.where(lock_type: nil).where(arel_table[:updated_at].gt(EXPIRED_INTERVAL.ago)))
-      else
-        advisory_locked
-      end
+      query = joins_advisory_locks
+      query.where(lock_type: LOCK_TYPE_ENUMS[LOCK_TYPE_ADVISORY]).advisory_locked
+        .or(query.where(lock_type: nil).where(arel_table[:updated_at].gt(EXPIRED_INTERVAL.ago)))
     end)
 
     # Processes that are inactive and unlocked (e.g. SIGKILLed)
@@ -47,13 +43,9 @@ module GoodJob # :nodoc:
     # @!scope class
     # @return [ActiveRecord::Relation]
     scope :inactive, (lambda do
-      if lock_type_migrated?
-        query = joins_advisory_locks
-        query.where(lock_type: LOCK_TYPE_ENUMS[LOCK_TYPE_ADVISORY]).advisory_unlocked
-          .or(query.where(lock_type: nil).where(arel_table[:updated_at].lt(EXPIRED_INTERVAL.ago)))
-      else
-        advisory_unlocked
-      end
+      query = joins_advisory_locks
+      query.where(lock_type: LOCK_TYPE_ENUMS[LOCK_TYPE_ADVISORY]).advisory_unlocked
+        .or(query.where(lock_type: nil).where(arel_table[:updated_at].lt(EXPIRED_INTERVAL.ago)))
     end)
 
     # Deletes all inactive process records.
@@ -64,11 +56,6 @@ module GoodJob # :nodoc:
       end
     end
 
-    # @return [Boolean]
-    def self.lock_type_migrated?
-      columns_hash["lock_type"].present?
-    end
-
     def self.create_record(id:, with_advisory_lock: false)
       attributes = {
         id: id,
@@ -76,7 +63,7 @@ module GoodJob # :nodoc:
       }
       if with_advisory_lock
         attributes[:create_with_advisory_lock] = true
-        attributes[:lock_type] = LOCK_TYPE_ADVISORY if lock_type_migrated?
+        attributes[:lock_type] = LOCK_TYPE_ADVISORY
       end
       create!(attributes)
     end

data/app/views/good_job/batches/index.html.erb

@@ -2,19 +2,15 @@
   <h2 class="pt-3 pb-2"><%= t ".title" %></h2>
 </div>
 
-<% if GoodJob::BatchRecord.migrated? %>
-  <%= render 'good_job/batches/table', batches: @filter.records, filter: @filter %>
-  <% if @filter.records.present? %>
-    <nav aria-label="Batch pagination" class="mt-3">
-      <ul class="pagination">
-        <li class="page-item">
-          <%= link_to(@filter.to_params(after_created_at: @filter.last.created_at, after_id: @filter.last.id), class: "page-link") do %>
-            <%= t ".older_batches" %> <span aria-hidden="true">&raquo;</span>
-          <% end %>
-        </li>
-      </ul>
-    </nav>
-  <% end %>
-<% else %>
-  <h3 class="text-center my-5"><%= t ".pending_migrations" %></h3>
+<%= render 'good_job/batches/table', batches: @filter.records, filter: @filter %>
+<% if @filter.records.present? %>
+  <nav aria-label="Batch pagination" class="mt-3">
+    <ul class="pagination">
+      <li class="page-item">
+        <%= link_to(@filter.to_params(after_created_at: @filter.last.created_at, after_id: @filter.last.id), class: "page-link") do %>
+          <%= t ".older_batches" %> <span aria-hidden="true">&raquo;</span>
+        <% end %>
+      </li>
+    </ul>
+  </nav>
 <% end %>

data/app/views/good_job/jobs/_executions.erb

@@ -38,7 +38,7 @@
             <strong class="small text-danger"><%= t "good_job.shared.error" %>:</strong>
             <code class="text-wrap text-break m-0 text-secondary-emphasis"><%= execution.error %></code>
           </div>
-          <% if GoodJob::DiscreteExecution.backtrace_migrated? && execution.error_backtrace&.any? %>
+          <% if execution.error_backtrace&.any? %>
             <%= tag.ul class: "nav nav-tabs small w-fit-content", id: dom_id(execution, :tab), role: "tablist" do %>
               <li class="nav-item" role="presentation">
                 <%= tag.button t(".application_trace"), class: "nav-link active p-1", id: dom_id(execution, :application), data: { bs_toggle: "tab", bs_target: dom_id(execution, :"#application_pane") }, type: "button", role: "tab", aria: { controls: dom_id(execution, :application_pane), selected: true } %>

data/app/views/good_job/jobs/_table.erb

@@ -102,7 +102,7 @@
                   <%= tag.span relative_time(job.last_status_at), class: "small mt-1" %>
                   <div>
                     <%= status_badge job.status %>
-                    <% if job.status == :discarded && job.class.error_event_migrated? && job.error_event %>
+                    <% if job.status == :discarded && job.error_event %>
                       <div class="text-black text-center">
                         <small><%= t(job.error_event, scope: 'good_job.error_event') %></small>
                       </div>

data/app/views/good_job/jobs/show.html.erb

@@ -5,9 +5,6 @@
         <li class="breadcrumb-item"><%= link_to t(".jobs"), jobs_path %></li>
         <li class="breadcrumb-item active" aria-current="page">
           <%= tag.code @job.id, class: "text-muted" %>
-          <% if @job.discrete? %>
-            <span class="badge bg-info">Discrete</span>
-          <% end %>
         </li>
       </ol>
     </nav>
@@ -87,8 +84,4 @@
   <%= tag.pre JSON.pretty_generate(@job.display_serialized_params) %>
 <% end %>
 
-<% if @job.discrete? %>
-  <%= render 'executions', executions: @job.discrete_executions.reverse %>
-<% else %>
-  <%= render 'executions', executions: @job.executions.includes_advisory_locks.reverse %>
-<% end %>
+<%= render 'executions', executions: @job.executions.reverse %>

data/app/views/good_job/performances/show.html.erb

@@ -2,49 +2,42 @@
   <h2 class="pt-3 pb-2"><%= t ".title" %></h2>
 </div>
 
-<% if @needs_upgrade %>
-  <div class="alert alert-warning">
-    <%= t "shared.needs_migration" %>
-  </div>
-<% else %>
-
-  <div class="my-3 card">
-    <div class="list-group list-group-flush text-nowrap" role="table">
-      <header class="list-group-item bg-body-tertiary">
-        <div class="row small text-muted text-uppercase align-items-center">
-          <div class="col-12 col-lg-4"><%= t ".job_class" %></div>
-          <div class="col-lg-2 d-none d-lg-block"><%= t ".executions" %></div>
+<div class="my-3 card">
+  <div class="list-group list-group-flush text-nowrap" role="table">
+    <header class="list-group-item bg-body-tertiary">
+      <div class="row small text-muted text-uppercase align-items-center">
+        <div class="col-12 col-lg-4"><%= t ".job_class" %></div>
+        <div class="col-lg-2 d-none d-lg-block"><%= t ".executions" %></div>
 
-          <div class="col-lg-2 d-none d-lg-block"><%= t ".average_duration" %></div>
-          <div class="col-lg-2 d-none d-lg-block"><%= t ".minimum_duration" %></div>
-          <div class="col-lg-2 d-none d-lg-block"><%= t ".maximum_duration" %></div>
-        </div>
-      </header>
+        <div class="col-lg-2 d-none d-lg-block"><%= t ".average_duration" %></div>
+        <div class="col-lg-2 d-none d-lg-block"><%= t ".minimum_duration" %></div>
+        <div class="col-lg-2 d-none d-lg-block"><%= t ".maximum_duration" %></div>
+      </div>
+    </header>
 
-      <% @performances.each do |performance| %>
-        <div role="row" class="list-group-item py-3">
-          <div class="row align-items-center">
-            <div class="col-12 col-lg-4"><%= performance.job_class %></div>
-            <div class="col-6 col-lg-2 text-wrap">
-              <div class="d-lg-none small text-muted mt-1"><%= t ".executions" %></div>
-              <%= performance.executions_count %>
-            </div>
+    <% @performances.each do |performance| %>
+      <div role="row" class="list-group-item py-3">
+        <div class="row align-items-center">
+          <div class="col-12 col-lg-4"><%= performance.job_class %></div>
+          <div class="col-6 col-lg-2 text-wrap">
+            <div class="d-lg-none small text-muted mt-1"><%= t ".executions" %></div>
+            <%= performance.executions_count %>
+          </div>
 
-            <div class="col-6 col-lg-2 text-wrap">
-              <div class="d-lg-none small text-muted mt-1"><%= t ".average_duration" %></div>
-              <%= format_duration performance.avg_duration %>
-            </div>
-            <div class="col-6 col-lg-2 text-wrap">
-              <div class="d-lg-none small text-muted mt-1"><%= t ".minimum_duration" %></div>
-              <%= format_duration performance.min_duration %>
-            </div>
-            <div class="col-6 col-lg-2 text-wrap">
-              <div class="d-lg-none small text-muted mt-1"><%= t ".maximum_duration" %></div>
-              <%= format_duration performance.max_duration %>
-            </div>
+          <div class="col-6 col-lg-2 text-wrap">
+            <div class="d-lg-none small text-muted mt-1"><%= t ".average_duration" %></div>
+            <%= format_duration performance.avg_duration %>
+          </div>
+          <div class="col-6 col-lg-2 text-wrap">
+            <div class="d-lg-none small text-muted mt-1"><%= t ".minimum_duration" %></div>
+            <%= format_duration performance.min_duration %>
+          </div>
+          <div class="col-6 col-lg-2 text-wrap">
+            <div class="d-lg-none small text-muted mt-1"><%= t ".maximum_duration" %></div>
+            <%= format_duration performance.max_duration %>
           </div>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/config/locales/de.yml

@@ -11,7 +11,6 @@ de:
     batches:
       index:
         older_batches: Ältere Chargen
-        pending_migrations: GoodJob hat ausstehende Datenbankmigrationen.
         title: Chargen
       jobs:
         actions:
@@ -48,7 +47,6 @@ de:
       index:
         no_cron_schedules_found: Keine Cron-Zeitpläne gefunden.
         title: Cron-Zeitpläne
-      pending_migrations: Erfordert ausstehende GoodJob-Datenbankmigration.
       show:
         cron_entry_key: Cron-Eingabetaste
     datetime:
@@ -240,6 +238,7 @@ de:
           dark: Dunkel
           light: Licht
           theme: Thema
+      pending_migrations: GoodJob hat ausstehende Datenbankmigrationen.
       secondary_navbar:
         inspiration: Denk daran, auch du machst einen guten Job!
         last_updated: Zuletzt aktualisiert
@@ -250,5 +249,3 @@ de:
       running: Laufend
       scheduled: Geplant
       succeeded: Erfolgreich
-  shared:
-    needs_migration: Bitte führen Sie GoodJob-Migrationen aus.

data/config/locales/en.yml

@@ -11,7 +11,6 @@ en:
     batches:
       index:
         older_batches: Older batches
-        pending_migrations: GoodJob has pending database migrations.
         title: Batches
       jobs:
         actions:
@@ -48,7 +47,6 @@ en:
       index:
         no_cron_schedules_found: No cron schedules found.
         title: Cron Schedules
-      pending_migrations: Requires pending GoodJob database migration.
       show:
         cron_entry_key: Cron Entry Key
     datetime:
@@ -240,6 +238,7 @@ en:
           dark: Dark
           light: Light
           theme: Theme
+      pending_migrations: GoodJob has pending database migrations.
       secondary_navbar:
         inspiration: Remember, you're doing a Good Job too!
         last_updated: Last updated
@@ -250,5 +249,3 @@ en:
       running: Running
       scheduled: Scheduled
       succeeded: Succeeded
-  shared:
-    needs_migration: Please run GoodJob migrations.

data/config/locales/es.yml

@@ -11,7 +11,6 @@ es:
     batches:
       index:
         older_batches: Batches anteriores
-        pending_migrations: GoodJob tiene migraciones pendientes.
         title: Batches
       jobs:
         actions:
@@ -48,7 +47,6 @@ es:
       index:
         no_cron_schedules_found: No hay tareas programadas.
         title: Tareas Programadas
-      pending_migrations: Require las migraciones de GoodJob pendientes.
       show:
         cron_entry_key: Cron Entry Key
     datetime:
@@ -240,6 +238,7 @@ es:
           dark: Oscuro
           light: Luz
           theme: Tema
+      pending_migrations: GoodJob tiene migraciones pendientes.
       secondary_navbar:
         inspiration: "¡Recuerda, también tú estás haciendo un buen trabajo!"
         last_updated: Última actualización
@@ -250,5 +249,3 @@ es:
       running: Ejecutando
       scheduled: Programado
       succeeded: Exitoso
-  shared:
-    needs_migration: Ejecute las migraciones de GoodJob.

data/config/locales/fr.yml

@@ -11,7 +11,6 @@ fr:
     batches:
       index:
         older_batches: Lots plus anciens
-        pending_migrations: GoodJob a des migrations de bases de données en attente.
         title: Lots
       jobs:
         actions:
@@ -48,7 +47,6 @@ fr:
       index:
         no_cron_schedules_found: Aucune planification cron trouvée.
         title: Entrées Cron
-      pending_migrations: Nécessite une migration de la base de données GoodJob en attente.
       show:
         cron_entry_key: Clé d'entrée Cron
     datetime:
@@ -240,6 +238,7 @@ fr:
           dark: Sombre
           light: Lumière
           theme: Thème
+      pending_migrations: GoodJob a des migrations de bases de données en attente.
       secondary_navbar:
         inspiration: N'oublie pas, toi aussi tu fais du bon boulot !
         last_updated: Dernière mise à jour
@@ -250,5 +249,3 @@ fr:
       running: En cours
       scheduled: Planifiés
       succeeded: Réussis
-  shared:
-    needs_migration: Veuillez exécuter des migrations GoodJob.