summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-15 14:44:54 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:53:58 +0000
commitc6723ed3e018d6249ca9409ebd08c04bd76dea97 (patch)
tree99335ab8ba7b6d88877ba031fd663dff6dfd06da /app
parent7f12cb0eed06ad3f83126a3a8038e7fa658f4eac (diff)
downloadgitlab-ce-c6723ed3e018d6249ca9409ebd08c04bd76dea97.tar.gz
Updated configuration saving
Diffstat (limited to 'app')
-rw-r--r--app/services/projects/update_pages_configuration_service.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/services/projects/update_pages_configuration_service.rb b/app/services/projects/update_pages_configuration_service.rb
index b5324587d0e..188847b5ad6 100644
--- a/app/services/projects/update_pages_configuration_service.rb
+++ b/app/services/projects/update_pages_configuration_service.rb
@@ -7,7 +7,7 @@ module Projects
end
def execute
- update_file(pages_config_file, pages_config)
+ update_file(pages_config_file, pages_config.to_json)
reload_daemon
success
rescue => e
@@ -52,18 +52,18 @@ module Projects
def update_file(file, data)
unless data
- File.rm(file, force: true)
+ FileUtils.remove(file, force: true)
return
end
temp_file = "#{file}.#{SecureRandom.hex(16)}"
- File.open(temp_file, 'w') do |file|
- file.write(data)
+ File.open(temp_file, 'w') do |f|
+ f.write(data)
end
- File.mv(temp_file, file, force: true)
+ FileUtils.move(temp_file, file, force: true)
ensure
# In case if the updating fails
- File.rm(temp_file, force: true)
+ FileUtils.remove(temp_file, force: true)
end
end
end