Merge branch 'develop' into standalone_develop

app/models/message_template/project_milestone.rb

@@ -47,11 +47,10 @@ class MessageTemplate::ProjectMilestone < MessageTemplate
       content = email 
       content.gsub!('{receiver}', receiver&.real_name)
       content.gsub!('{baseurl}', base_url)
-      content.gsub!('{login1}', operator&.login)
       content.gsub!('{nickname1}', operator&.real_name)
       content.gsub!('{nickname2}', owner&.real_name)
       content.gsub!('{repository}', project&.name)
-      content.gsub!('{login2}', owner&.login)
+      content.gsub!('{login}', owner&.login)
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{id}', milestone&.id.to_s)
       content.gsub!('{name}', milestone&.name)