Eeeros
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2022-08-02 19:04:04 +08:00
parent bf6a11dadd ab5d273f98
commit 0be06c8282
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/repository.rb
View File

@ -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

1
app/views/api/v1/projects/_simple_gitea_diff_detail.json.jbuilder
View File

@ -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']

1
app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder
View File

@ -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']