aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-02-23 19:22:55 +0100
committerGitHub <noreply@github.com>2017-02-23 19:22:55 +0100
commit8f59a1dd878f56798f88369fa5b448f17a29679d (patch)
tree5ba674c73ffb5e2f246e7a2d0a8db579733d37f5 /railties/lib/rails/generators.rb
parent4734d23c74fb4193aafe7cb04256bb745680d97f (diff)
parent9fdf326a5f6f7e10594dd6205cfc8e0425fb3e67 (diff)
downloadrails-8f59a1dd878f56798f88369fa5b448f17a29679d.tar.gz
rails-8f59a1dd878f56798f88369fa5b448f17a29679d.tar.bz2
rails-8f59a1dd878f56798f88369fa5b448f17a29679d.zip
Merge pull request #28128 from rails/revert-28127-revert-28038-encrypted-secrets
Revert "Revert "Add encrypted secrets""
Diffstat (limited to 'railties/lib/rails/generators.rb')
-rw-r--r--railties/lib/rails/generators.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 85f66cc416..3f1bf6a5bb 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -214,6 +214,7 @@ module Rails
rails.map! { |n| n.sub(/^rails:/, "") }
rails.delete("app")
rails.delete("plugin")
+ rails.delete("encrypted_secrets")
hidden_namespaces.each { |n| groups.delete(n.to_s) }