consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplication in dashboard layout head

Browse Source 
Apparently the dashboard branch wasn't updated after we extracted a
common head for all layouts in commit 6e4f697ce, so when said branch was
merged we reintroduced the duplication. Furthermore, we forgot to add to
the dashboard layout the changes we were applying to the common head
partial.
This commit is contained in:
Javi Martín
2022-08-03 13:21:15 +02:00
parent eb39e8e365
commit 4d674bf643
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/layouts/dashboard.html.erb
View File

@@ -1,16 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= I18n.locale %>" data-current-user-id="<%= current_user&.id %>"> <html lang="<%= I18n.locale %>" data-current-user-id="<%= current_user&.id %>">
<head> <head>
<meta charset="utf-8" /> <%= render "layouts/common_head", default_title: setting["org_name"] %>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<%= render "layouts/meta_tags" %> <%= render "layouts/meta_tags" %>
<title><%= content_for?(:title) ? yield(:title) : setting["org_name"] %></title>
<%= content_for :canonical %> <%= content_for :canonical %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %>
<%= csrf_meta_tags %>
<%= favicon_link_tag "favicon.ico" %>
<%= favicon_link_tag image_path_for("apple-touch-icon-200.png"), <%= favicon_link_tag image_path_for("apple-touch-icon-200.png"),
rel: "icon apple-touch-icon", rel: "icon apple-touch-icon",
sizes: "200x200", sizes: "200x200",