Merge branch 'develop' into standalone_develop

This commit is contained in:
2022-03-31 16:08:43 +08:00
2 changed files with 14 additions and 2 deletions
+2 -2
View File
@@ -18,7 +18,7 @@ json.setting do
#
# end
nav_bar = default_setting.navbar
# nav_bar = default_setting.navbar
# if User.current.logged?
# nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
@@ -39,7 +39,7 @@ json.setting do
json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1)
json.oj_banner_url default_setting.oj_banner_url&.[](1..-1)
json.navbar nav_bar
json.navbar @navbar
json.footer default_setting.footer