post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge commit '4b9e4f6398' into kb_development

Browse source
This commit is contained in:
KMY 2023-04-04 20:30:02 +09:00
commit 462c6e99b6
12 changed files with 51 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/auth/registrations_controller.rb
View file

@ -46,7 +46,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
super(hash)
resource.locale = I18n.locale
resource.invite_code = params[:invite_code] if resource.invite_code.blank?
resource.invite_code = @invite&.code if resource.invite_code.blank?
resource.registration_form_time = session[:registration_form_time]
resource.sign_up_ip = request.remote_ip

6
app/controllers/backups_controller.rb
View file

@ -13,7 +13,11 @@ class BackupsController < ApplicationController
when :s3
redirect_to @backup.dump.expiring_url(10)
when :fog
redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
if Paperclip::Attachment.default_options.dig(:storage, :fog_credentials, :openstack_temp_url_key).present?
redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
else
redirect_to full_asset_url(@backup.dump.url)
end
when :filesystem
redirect_to full_asset_url(@backup.dump.url)
end