Merge branch 'rails' into rollups
This commit is contained in:
commit
449829ff09
2 changed files with 1 additions and 2 deletions
1
Makefile
1
Makefile
|
@ -108,7 +108,6 @@ ota-js: assets ## Actualizar Javascript en el nodo delegado
|
||||||
|
|
||||||
ota: ## Actualizar Rails en el nodo delegado
|
ota: ## Actualizar Rails en el nodo delegado
|
||||||
umask 022; git format-patch $(commit)
|
umask 022; git format-patch $(commit)
|
||||||
scp ./0*.patch $(delegate):/tmp/
|
|
||||||
ssh $(delegate) mkdir -p /tmp/patches-$(commit)/
|
ssh $(delegate) mkdir -p /tmp/patches-$(commit)/
|
||||||
scp ./0*.patch $(delegate):/tmp/patches-$(commit)/
|
scp ./0*.patch $(delegate):/tmp/patches-$(commit)/
|
||||||
scp ./ota.sh $(delegate):/tmp/
|
scp ./ota.sh $(delegate):/tmp/
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
- if @site.locales.size > 1
|
- if @site.locales.size > 1
|
||||||
%nav#locales
|
%nav#locales
|
||||||
- @site.locales.each do |locale|
|
- @site.locales.each do |locale|
|
||||||
= link_to t("locales.#{locale}.name"), site_posts_path(@site, **@filter_params.merge(locale: locale)),
|
= link_to @site.data.dig(locale.to_s, 'locale') || locale, site_posts_path(@site, **@filter_params.merge(locale: locale)),
|
||||||
class: "mr-2 mt-2 mb-2 #{locale == @locale ? 'active font-weight-bold' : ''}"
|
class: "mr-2 mt-2 mb-2 #{locale == @locale ? 'active font-weight-bold' : ''}"
|
||||||
.pl-2-plus
|
.pl-2-plus
|
||||||
- @filter_params.each do |param, value|
|
- @filter_params.each do |param, value|
|
||||||
|
|
Loading…
Reference in a new issue