diff --git a/INSTALL.debian b/INSTALL.debian index 8df94893e..a0a1b906b 100644 --- a/INSTALL.debian +++ b/INSTALL.debian @@ -121,10 +121,6 @@ cd /home/danbooru sudo -u danbooru mkdir /home/danbooru/apps git clone git://github.com/r888888888/danbooru.git danbooru chown -R danbooru:danbooru danbooru -cap deploy:setup -cap deploy:update_code -cap deploy:migrate -chown danbooru:danbooru /var/www/danbooru/shared/log/development.log echo echo diff --git a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb index 21112a86a..9a7584d3f 100644 --- a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb +++ b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb @@ -2,4 +2,4 @@
The password for the user "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> has been reset. It is now <%= @new_password %>.
Please log in to the website and <%= link_to "change your password", edit_user_path(@user) %> as soon as possible.
+Please log in to the website and <%= link_to "change your password", edit_user_path(@user, :host => Danbooru.config.hostname) %> as soon as possible.
diff --git a/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb b/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb index ad4235d30..7bf58b0ca 100644 --- a/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb +++ b/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb @@ -1,4 +1,4 @@Someone has requested that the password for "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> be reset. If you did not request this, then you can ignore this email.
-To reset your password, please visit <%= link_to "this link", edit_maintenance_user_password_reset_path(:key => @nonce.key, :email => @nonce.email) %>.
+To reset your password, please visit <%= link_to "this link", edit_maintenance_user_password_reset_path(:host => Danbooru.config.hostname, :key => @nonce.key, :email => @nonce.email) %>.
diff --git a/app/views/report_mailer/moderator_report.html.erb b/app/views/report_mailer/moderator_report.html.erb index 7ac165a4e..30799f158 100644 --- a/app/views/report_mailer/moderator_report.html.erb +++ b/app/views/report_mailer/moderator_report.html.erb @@ -16,8 +16,8 @@ <% User.find(:all, :conditions => ["level >= ?", CONFIG["user_levels"]["Test Janitor"]], :order => "level, name").each do |user| %>