Merge branch 'develop' into standalone_develop

app/models/repository.rb

@@ -49,7 +49,7 @@ class Repository < ApplicationRecord
   end
 
   def url
-    self['url'].blank? ? "#{Gitea.gitea_config[:domain]}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
+    self['url'].blank? ? "#{GiteaService.gitea_config[:domain]}/#{self.owner&.login}/#{self.identifier}.git" : self['url']
   end
 
   # with repository is mirror

app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder

@@ -14,6 +14,7 @@ json.files diff['Files'].each do |file|
   json.is_renamed file['IsRenamed']
   json.is_ambiguous file['IsAmbiguous']
   json.is_submodule file['IsSubmodule']
+  json.diff file['Diff']
   json.sections file['Sections'] do |section|
     json.file_name section['FileName']
     json.name section['Name']

app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder

@@ -10,6 +10,7 @@ json.name file['Name']
   json.is_renamed file['IsRenamed']
   json.is_ambiguous file['IsAmbiguous']
   json.is_submodule file['IsSubmodule']
+  json.diff file['Diff']
   json.sections file['Sections'] do |section|
     json.file_name section['FileName']
     json.name section['Name']