1 files changed, 8 insertions, 8 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 3595f60bf8..c2403c57a7 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -293,25 +293,25 @@ module Rails
       end
 
       private
-        def credentials_available_for_current_env?
-          File.exist?("#{root}/config/credentials/#{Rails.env}.yml.enc")
-        end
-
         def default_credentials_content_path
           if credentials_available_for_current_env?
-            File.join(root, "config", "credentials", "#{Rails.env}.yml.enc")
+            root.join("config", "credentials", "#{Rails.env}.yml.enc")
           else
-            File.join(root, "config", "credentials.yml.enc")
+            root.join("config", "credentials.yml.enc")
           end
         end
 
         def default_credentials_key_path
           if credentials_available_for_current_env?
-            File.join(root, "config", "credentials", "#{Rails.env}.key")
+            root.join("config", "credentials", "#{Rails.env}.key")
           else
-            File.join(root, "config", "master.key")
+            root.join("config", "master.key")
           end
         end
+
+        def credentials_available_for_current_env?
+          File.exist?(root.join("config", "credentials", "#{Rails.env}.yml.enc"))
+        end
     end
   end
 end