Commit 8c850380 authored by Bob Van Landuyt's avatar Bob Van Landuyt Committed by Bob Van Landuyt

Add punctuation to log messages

parent 171f2d97
...@@ -145,8 +145,9 @@ module Gitlab ...@@ -145,8 +145,9 @@ module Gitlab
yield(path_before_rename, path_after_rename) yield(path_before_rename, path_after_rename)
rescue StandardError => e rescue StandardError => e
failed_reverts << rename_info failed_reverts << rename_info
say "Renaming #{type} from back to #{path_before_rename} failed. "\ say "Renaming #{type} from #{path_after_rename} back to "\
"Review the error and try again by running the `down` action. \n"\ "#{path_before_rename} failed. Review the error and try "\
"again by running the `down` action. \n"\
"#{e.message}: \n #{e.backtrace.join("\n")}" "#{e.message}: \n #{e.backtrace.join("\n")}"
end end
end end
......
...@@ -50,7 +50,7 @@ module Gitlab ...@@ -50,7 +50,7 @@ module Gitlab
rename_namespace_dependencies(namespace, current_path, path_before_rename) rename_namespace_dependencies(namespace, current_path, path_before_rename)
else else
say "Couldn't rename namespace from #{current_path} back to #{path_before_rename} "\ say "Couldn't rename namespace from #{current_path} back to #{path_before_rename}, "\
"namespace was renamed, or no longer exists at the expected path" "namespace was renamed, or no longer exists at the expected path"
end end
end end
......
...@@ -33,12 +33,13 @@ module Gitlab ...@@ -33,12 +33,13 @@ module Gitlab
matches_path = MigrationClasses::Route.arel_table[:path].matches(current_path) matches_path = MigrationClasses::Route.arel_table[:path].matches(current_path)
project = MigrationClasses::Project.joins(:route) project = MigrationClasses::Project.joins(:route)
.where(matches_path).first .where(matches_path).first
if project if project
perform_rename(project, current_path, path_before_rename) perform_rename(project, current_path, path_before_rename)
move_project_folders(project, current_path, path_before_rename) move_project_folders(project, current_path, path_before_rename)
else else
say "Couldn't rename Project from #{current_path} back to "\ say "Couldn't rename project from #{current_path} back to "\
"#{path_before_rename}, project was renamed or no longer "\ "#{path_before_rename}, project was renamed or no longer "\
"exists at the expected path." "exists at the expected path."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment