2 files changed, 15 insertions, 4 deletions
diff --git a/railties/lib/rails/commands/secrets/secrets_command.rb b/railties/lib/rails/commands/secrets/secrets_command.rb
index 3ba8c0c85b..65db81ac73 100644
--- a/railties/lib/rails/commands/secrets/secrets_command.rb
+++ b/railties/lib/rails/commands/secrets/secrets_command.rb
@@ -18,16 +18,27 @@ module Rails
       end
 
       def edit
+        if ENV["EDITOR"].empty?
+          say "No $EDITOR to open decrypted secrets in. Assign one like this:"
+          say ""
+          say %(EDITOR="mate --wait" bin/rails secrets:edit)
+          say ""
+          say "For editors that fork and exit immediately, it's important to pass a wait flag,"
+          say "otherwise the secrets will be saved immediately with no chance to edit."
+
+          return
+        end
+
         require_application_and_environment!
 
         Rails::Secrets.read_for_editing do |tmp_path|
-          puts "Waiting for secrets file to be saved. Abort with Ctrl-C."
+          say "Waiting for secrets file to be saved. Abort with Ctrl-C."
           system("\$EDITOR #{tmp_path}")
         end
 
-        puts "New secrets encrypted and saved."
+        say "New secrets encrypted and saved."
       rescue Interrupt
-        puts "Aborted changing encrypted secrets: nothing saved."
+        say "Aborted changing encrypted secrets: nothing saved."
       rescue Rails::Secrets::MissingKeyError => error
         say error.message
       end
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 1fa27a3155..7e8c86fb49 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -177,7 +177,7 @@ module Rails
                 user_supplied_options << name
               end
             end
-            user_supplied_options << :Host if ENV["Host"]
+            user_supplied_options << :Host if ENV["HOST"]
             user_supplied_options << :Port if ENV["PORT"]
             user_supplied_options.uniq
           end