FIX merge

app/views/settings/show.json.jbuilder

@@ -16,17 +16,17 @@ json.setting do
   #
   #   json.footer setting.footer || default_setting.footer
   #
-  #   json.main_site current_laboratory.main_site?
   # end
 
   nav_bar = default_setting.navbar
-  if User.current.logged?
-    nav_bar[2]["link"] = "/users/#{current_user.login}/projects"
-    nav_bar[2]["hidden"] = false
-  else
-    nav_bar[2]["link"] = ""
-    nav_bar[2]["hidden"] = true
-  end
+
+  # if User.current.logged?
+  #   nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
+  #   nav_bar[2]["hidden"] = false
+  # else
+  #   nav_bar[2]["link"] = ""
+  #   nav_bar[2]["hidden"] = true
+  # end
 
   json.name default_setting.name
   json.nav_logo_url default_setting.nav_logo_url&.[](1..-1)
@@ -48,4 +48,4 @@ json.setting do
   json.old_projects_url @old_projects_url
 
 
-end
+end