Skip to content

Commit e78ed07

Browse files
rafaelfrancarafaelfranca
authored
Merge pull request rails#47259 from skipkayhil/hm-regenerate-dummies
Full refresh of framework dummy applications
2 parents 23c134e + 23a459b commit e78ed07

File tree

115 files changed

+790
-8329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+790
-8329
lines changed

‎.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ AllCops:
1616
- '**/vendor/**/*'
1717
- 'actionpack/lib/action_dispatch/journey/parser.rb'
1818
- 'actionmailbox/test/dummy/**/*'
19+
- 'activestorage/test/dummy/**/*'
1920
- 'actiontext/test/dummy/**/*'
2021
- '**/node_modules/**/*'
2122

‎actionmailbox/test/dummy/.babelrc

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎actionmailbox/test/dummy/.postcssrc.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎actionmailbox/test/dummy/app/assets/config/manifest.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
//= link_tree ../images
2-
//= link_directory ../javascripts .js
32
//= link_directory ../stylesheets .css

‎actionmailbox/test/dummy/app/jobs/application_job.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
class ApplicationJob < ActiveJob::Base
2+
# Automatically retry jobs that encountered a deadlock
3+
# retry_on ActiveRecord::Deadlocked
4+
5+
# Most jobs are safe to ignore if the underlying records are no longer available
6+
# discard_on ActiveJob::DeserializationError
27
end

‎actionmailbox/test/dummy/app/mailers/application_mailer.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
class ApplicationMailer < ActionMailer::Base
2-
default from: '[email protected]'
3-
layout 'mailer'
2+
default from: "[email protected]"
3+
layout "mailer"
44
end

‎actionmailbox/test/dummy/app/models/application_record.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
class ApplicationRecord < ActiveRecord::Base
2-
self.abstract_class = true
2+
primary_abstract_class
33
end

‎actionmailbox/test/dummy/app/views/layouts/application.html.erb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
<html>
33
<head>
44
<title>Dummy</title>
5+
<meta name="viewport" content="width=device-width,initial-scale=1">
56
<%= csrf_meta_tags %>
7+
<%= csp_meta_tag %>
68

7-
<%= stylesheet_link_tag 'application', media: 'all' %>
8-
<%= javascript_pack_tag 'application' %>
9+
<%= stylesheet_link_tag "application" %>
910
</head>
1011

1112
<body>

‎actionmailbox/test/dummy/bin/bundle

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎actionmailbox/test/dummy/bin/rails

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env ruby
2-
APP_PATH = File.expand_path('../config/application', __dir__)
2+
APP_PATH = File.expand_path("../config/application", __dir__)
33
require_relative "../config/boot"
44
require "rails/commands"

0 commit comments

Comments
 (0)