Consolidate people/author #37

Merged

vosaul merged 13 commits from vs-people-author into dev 2022-05-23 14:48:25 +00:00

Conversation 6 Commits 13 Files changed 26 +133 -136

vosaul commented 2022-05-12 07:00:43 +00:00 (Migrated from gitlab.com)

Copy link

As we discussed earlier, the information about persons is unified

• personal information transferred from /_data/people.yml to /_profile/.md
• in the files .md in the frontmatter basic information about the author, in the body - any additional information
• If the frontmatter has a role field (even an empty one), this person will be displayed on the Community page

resolve #1

diff --git a/_config.yml b/_config.yml
index 60e5c2f..562ffde 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,9 +43,6 @@ collections:
profile:
output: true
permalink: /people/:path/

• team:
• output: true
• permalink: /team/:path/

Defaults

defaults:
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 453c286..36c1a07 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -9,5 +9,4 @@ main:
url: "/policies"

• title: "Community"
  url: "/community"
• • title: "Team"
• url: "/teama"

diff --git a/_includes/footer.html b/_includes/footer.html
index 1774b70..292c0f4 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,16 +1,16 @@

•  {%- assign license = page.license | default: site.licensing[page.type] | default: site.licensing.default | replace: " ", "" | replace: "-", "" | downcase  -%}
  

•  {%- assign license = site.data.licenses[license] -%}
  

+{%- assign license = page.license | default: site.licensing[page.type] | default: site.licensing.default | replace: " ", "" | replace: "-", "" | downcase -%}
+{%- assign license = site.data.licenses[license] -%}

•  <div class="w-11/12 xl:w-2/3 flex flex-wrap justify-between items-center mx-auto">
  

•    <section class="mx-auto md:mx-0" role="license">
  

•      <a rel="license" title="{{ license.description }}" href="{{ license.url }}"><img src="{{ license.image }}" class="inline" alt="Creative Commons License"></a>&nbsp; unless otherwise stated.
  

•    </section>
  

+

•   unless otherwise stated.

•    <section class="mx-auto md:mx-0" role="contentinfo">
  

•      <span class="align-middle">
  

•   <a href="{{ site.code_url }}" class="text-blue hover:underline">source</a>,
  

•   <a href="/credits.html" class="text-blue hover:underline">credits</a>,
  

•   <a href="/privacy.html" class="text-blue hover:underline">privacy</a>,
  

•   no trackers, no ads, no js</span>
  

•    </section>
  

•  </div>
  

+source,
+credits,
+privacy,
+no trackers, no ads, no js

+

diff --git a/_includes/header.html b/_includes/header.html
index f2ba5a6..63f0e86 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,29 +1,29 @@

•  {%- assign navigation = site.data.navigation[include.navigation] -%}
  

+{%- assign navigation = site.data.navigation[include.navigation] -%}

•  <nav class="w-11/12 md:my-3 mx-auto dark:bg-grey-dark dark:text-white-dark">
  

•    <input type="checkbox" id="menu" class="hidden">
  

•    <label for="menu" class="lg:hidden float-right pr-4 pt-1 text-3xl">
  

•      <i class="fa fa-bars text-grey-dark dark:text-white-dark"></i>
  

•    </label>
  

+

•    <ul class="menu overflow-hidden lg:flex p-0 m-0 pt-1">
  

•      <li class="md:ml-2 lg:ml-0 md:mr-9 mb-2 md:mb-0 pl-4 md:pl-0 md:pt-1 text-2xl align-middle">
  

•        <a href="/" class="text-slate-800 md:text-slate-800 hover:text-slate-900">{{ site.name }}</a>
  

•      </li>
  

•      {% for nav in navigation %}
  

•      <li class="pl-2 md:pl-0 md:pr-2 pt-1 text-xl md:text-base align-middle">
  

•        <a href="{{ nav.url }}" class="text-slate-800 md:text-slate-800 hover:text-slate-900 text-sm">{{ nav.title }}</a>
  

•      </li>
  

•      {% endfor %}
  

• •  <a href="{{site.baseurl}}/" class="text-slate-800 md:text-slate-800 hover:text-slate-900">{{ site.name }}</a>
    

  • {% for nav in navigation %}

  •  <a href="{{ nav.url | relative_url }}" class="text-slate-800 md:text-slate-800 hover:text-slate-900 text-sm">{{ nav.title }}</a>
    

  • {% endfor %}

  •      {% if site.support_us %}
    

  •      <li class="pl-4 md:pl-0 pb-2 md:pb-0 pt-1 text-xl md:text-base align-middle">
    

  •        <a class="text-pink hover:text-pink-dark md:font-bold text-sm	" href="/support/">Support&nbsp;Us &nbsp;<i class="fa fa-coffee hidden md:inline" aria-hidden="true"></i></a>
    

  •      </li>
    

  •      {% endif %}
    

  • {% if site.support_us %}

  •  <a class="text-pink hover:text-pink-dark md:font-bold text-sm	" href="/support/">Support&nbsp;Us &nbsp;<i class="fa fa-coffee hidden md:inline" aria-hidden="true"></i></a>
    

  • {% endif %}

  •      <li class="pl-4 md:pl-0 pb-2 md:pb-0 pt-1 md:self-center md:justify-self-end text-xl md:text-base align-middle md:ml-auto px-3 text-sm">
    

  •        {%- include toggler.html -%}
    

  •      </li>
    

  •    </ul>
    

  •  </nav>
    

  •  {%- include toggler.html -%}
    

+

diff --git a/_includes/team.html b/_includes/team.html
index 368ad0c..f082a4e 100644
--- a/_includes/team.html
+++ b/_includes/team.html
@@ -1,4 +1,4 @@
-{% assign team = site.team | sort %}
+{% assign team = site.profile | sort %}

Team

diff --git a/_pages/category/community.md b/_pages/category/community.md index a3113ee..508d5f7 100644 --- a/_pages/category/community.md +++ b/_pages/category/community.md @@ -6,4 +6,4 @@ permalink: "/community" --- Babka Social is not just a website, but a community that we're building together. It is the coming together of Jews from around the world to talk, support, celebrate, and discuss together. We come from a diversity of countries, a diversity of backgrounds and even beliefs, but we come together here as equals.

-We invite you to join us.
+We invite you to join us.
diff --git a/_pages/category/team.md b/_pages/category/team.md
deleted file mode 100644
index 4a88546..0000000
--- a/_pages/category/team.md
+++ /dev/null
@@ -1,9 +0,0 @@

-title: "Team"
-layout: team
-category: community
-permalink: "/teama"

-Babka Social is not just a website, but a community that we're building together. It is the coming together of Jews from around the world to talk, support, celebrate, and discuss together. We come from a diversity of countries, a diversity of backgrounds and even beliefs, but we come together here as equals.

-We invite you to join us.
diff --git a/_pages/people.html b/_pages/people.html
index 16da11a..cb18339 100644
--- a/_pages/people.html
+++ b/_pages/people.html
@@ -1,9 +1,9 @@

-title: "People"
+title: "Team"
layout: page-sidebar
-permalink: "/people.html"
+permalink: /people/

-{% assign people = site.data.people | sort %}
+{% assign people = site.profile | sort %}

{{page.title}}

@@ -11,17 +11,19 @@ permalink: "/people.html"

-

+

+ +

- -

{{ person[1].name }}

+ +

{{ person.name }}

(View Posts) -

{{ person[1].bio }}

+

{{ person.bio }}

-   -   +   +  

diff --git a/_pages/team.html b/_pages/team.html deleted file mode 100644 index a1223e1..0000000 --- a/_pages/team.html +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: "Team" -layout: page-sidebar -permalink: /team/ ---- -{% assign people = site.data.people | sort %} -

-

{{page.title}}

-

- {% for person in people %} -

-

-

-

-

- -

{{ person[1].name }}

- (View Posts) -

{{ person[1].bio }}

- -

-

-   -   -

-

-

-

-

-

- {% endfor %} -

-

\ No newline at end of file diff --git a/_profile/serge.md b/_profile/serge.md index 6b892a3..177205c 100644 --- a/_profile/serge.md +++ b/_profile/serge.md @@ -1,8 +1,12 @@ --- title: "Serge" person: serge -avatar : "/assets/images/people/serge.jpg" - +avatar : "/assets/images/people/serge.jpg" +role: founder +social: +- title: gitlab + link: https://gitlab.com/emacsen + icon: fa fa-fw fa-gitlab --- I'm Serge and I'm the founder of Babka Social!

diff --git a/_team/aschrijver.md b/_team/aschrijver.md
deleted file mode 100644
index 03b4c34..0000000
--- a/_team/aschrijver.md
+++ /dev/null
@@ -1,18 +0,0 @@

-title: "Arnold Schrijver"
-socialhub: aschrijver
-role: owner
-avatar : "/assets/images/people/arnold-schrijver.jpg"
-social:
-- title: github

• link: "https://github.com/aschrijver"
• icon: fa fa-github
  -- title: codeberg
• link: "https://codeberg.org/circlebuilder"
• icon:
  -- title: fediverse
• link: "https://mastodon.social/@humanetech"
• icon: fa fa-fw fa-mastodon

---

-SocialHub moderator, Humane Tech Community admin, FOSS and fedi advocate, techie.
\ No newline at end of file
diff --git a/_team/sal.md b/_team/sal.md
deleted file mode 100644
index 91dabb8..0000000
--- a/_team/sal.md
+++ /dev/null
@@ -1,6 +0,0 @@

-title: "Salt"
-person: sal2

-Hi folks. Salt here!
\ No newline at end of file
diff --git a/_team/serge.md b/_team/serge.md
deleted file mode 100644
index 177205c..0000000
--- a/_team/serge.md
+++ /dev/null
@@ -1,15 +0,0 @@

-title: "Serge"
-person: serge
-avatar : "/assets/images/people/serge.jpg"
-role: founder
-social:
-- title: gitlab

• link: https://gitlab.com/emacsen
• icon: fa fa-fw fa-gitlab

---

-I'm Serge and I'm the founder of Babka Social!

-I'm a technologist and a hacker in the Free/Open Source software world.

-I'm also a Jew, the grandson of a Holocaust survivor.

As we discussed earlier, the information about persons is unified - personal information transferred from /_data/people.yml to /_profile/<author>.md - in the files <author> .md in the frontmatter basic information about the author, in the body - any additional information - If the frontmatter has a role field (even an empty one), this person will be displayed on the Community page resolve #1 diff --git a/_config.yml b/_config.yml index 60e5c2f..562ffde 100644 --- a/_config.yml +++ b/_config.yml @@ -43,9 +43,6 @@ collections: profile: output: true permalink: /people/:path/ - team: - output: true - permalink: /team/:path/ # Defaults defaults: diff --git a/_data/navigation.yml b/_data/navigation.yml index 453c286..36c1a07 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -9,5 +9,4 @@ main: url: "/policies" - title: "Community" url: "/community" - - title: "Team" - url: "/teama" + diff --git a/_includes/footer.html b/_includes/footer.html index 1774b70..292c0f4 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,16 +1,16 @@ - {%- assign license = page.license | default: site.licensing[page.type] | default: site.licensing.default | replace: " ", "" | replace: "-", "" | downcase -%} - {%- assign license = site.data.licenses[license] -%} +{%- assign license = page.license | default: site.licensing[page.type] | default: site.licensing.default | replace: " ", "" | replace: "-", "" | downcase -%} +{%- assign license = site.data.licenses[license] -%} - <div class="w-11/12 xl:w-2/3 flex flex-wrap justify-between items-center mx-auto"> - <section class="mx-auto md:mx-0" role="license"> - <a rel="license" title="{{ license.description }}" href="{{ license.url }}"><img src="{{ license.image }}" class="inline" alt="Creative Commons License"></a>&nbsp; unless otherwise stated. - </section> +<div class="w-11/12 xl:w-2/3 flex flex-wrap justify-between items-center mx-auto"> + <section class="mx-auto md:mx-0" role="license"> + <a rel="license" title="{{ license.description }}" href="{{ license.url }}"><img src="{{site.baseurl}}/{{ license.image }}" class="inline" alt="Creative Commons License"></a>&nbsp; unless otherwise stated. + </section> - <section class="mx-auto md:mx-0" role="contentinfo"> - <span class="align-middle"> - <a href="{{ site.code_url }}" class="text-blue hover:underline">source</a>, - <a href="/credits.html" class="text-blue hover:underline">credits</a>, - <a href="/privacy.html" class="text-blue hover:underline">privacy</a>, - no trackers, no ads, no js</span> - </section> - </div> + <section class="mx-auto md:mx-0" role="contentinfo"> + <span class="align-middle"> +<a href="{{ site.code_url }}" class="text-blue hover:underline">source</a>, +<a href="{{site.baseurl}}/credits.html" class="text-blue hover:underline">credits</a>, +<a href="{{site.baseurl}}/privacy.html" class="text-blue hover:underline">privacy</a>, +no trackers, no ads, no js</span> + </section> +</div> diff --git a/_includes/header.html b/_includes/header.html index f2ba5a6..63f0e86 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,29 +1,29 @@ - {%- assign navigation = site.data.navigation[include.navigation] -%} +{%- assign navigation = site.data.navigation[include.navigation] -%} - <nav class="w-11/12 md:my-3 mx-auto dark:bg-grey-dark dark:text-white-dark"> - <input type="checkbox" id="menu" class="hidden"> - <label for="menu" class="lg:hidden float-right pr-4 pt-1 text-3xl"> - <i class="fa fa-bars text-grey-dark dark:text-white-dark"></i> - </label> +<nav class="w-11/12 md:my-3 mx-auto dark:bg-grey-dark dark:text-white-dark"> + <input type="checkbox" id="menu" class="hidden"> + <label for="menu" class="lg:hidden float-right pr-4 pt-1 text-3xl"> + <i class="fa fa-bars text-grey-dark dark:text-white-dark"></i> + </label> - <ul class="menu overflow-hidden lg:flex p-0 m-0 pt-1"> - <li class="md:ml-2 lg:ml-0 md:mr-9 mb-2 md:mb-0 pl-4 md:pl-0 md:pt-1 text-2xl align-middle"> - <a href="/" class="text-slate-800 md:text-slate-800 hover:text-slate-900">{{ site.name }}</a> - </li> - {% for nav in navigation %} - <li class="pl-2 md:pl-0 md:pr-2 pt-1 text-xl md:text-base align-middle"> - <a href="{{ nav.url }}" class="text-slate-800 md:text-slate-800 hover:text-slate-900 text-sm">{{ nav.title }}</a> - </li> - {% endfor %} + <ul class="menu overflow-hidden lg:flex p-0 m-0 pt-1"> + <li class="md:ml-2 lg:ml-0 md:mr-9 mb-2 md:mb-0 pl-4 md:pl-0 md:pt-1 text-2xl align-middle"> + <a href="{{site.baseurl}}/" class="text-slate-800 md:text-slate-800 hover:text-slate-900">{{ site.name }}</a> + </li> + {% for nav in navigation %} + <li class="pl-2 md:pl-0 md:pr-2 pt-1 text-xl md:text-base align-middle"> + <a href="{{ nav.url | relative_url }}" class="text-slate-800 md:text-slate-800 hover:text-slate-900 text-sm">{{ nav.title }}</a> + </li> + {% endfor %} - {% if site.support_us %} - <li class="pl-4 md:pl-0 pb-2 md:pb-0 pt-1 text-xl md:text-base align-middle"> - <a class="text-pink hover:text-pink-dark md:font-bold text-sm " href="/support/">Support&nbsp;Us &nbsp;<i class="fa fa-coffee hidden md:inline" aria-hidden="true"></i></a> - </li> - {% endif %} + {% if site.support_us %} + <li class="pl-4 md:pl-0 pb-2 md:pb-0 pt-1 text-xl md:text-base align-middle"> + <a class="text-pink hover:text-pink-dark md:font-bold text-sm " href="/support/">Support&nbsp;Us &nbsp;<i class="fa fa-coffee hidden md:inline" aria-hidden="true"></i></a> + </li> + {% endif %} - <li class="pl-4 md:pl-0 pb-2 md:pb-0 pt-1 md:self-center md:justify-self-end text-xl md:text-base align-middle md:ml-auto px-3 text-sm"> - {%- include toggler.html -%} - </li> - </ul> - </nav> + <li class="pl-4 md:pl-0 pb-2 md:pb-0 pt-1 md:self-center md:justify-self-end text-xl md:text-base align-middle md:ml-auto px-3 text-sm"> + {%- include toggler.html -%} + </li> + </ul> +</nav> diff --git a/_includes/team.html b/_includes/team.html index 368ad0c..f082a4e 100644 --- a/_includes/team.html +++ b/_includes/team.html @@ -1,4 +1,4 @@ -{% assign team = site.team | sort %} +{% assign team = site.profile | sort %} <h2 id="people" class="spanner mt-7 mb-6 text-2xl"> <span>Team</span> </h2> diff --git a/_pages/category/community.md b/_pages/category/community.md index a3113ee..508d5f7 100644 --- a/_pages/category/community.md +++ b/_pages/category/community.md @@ -6,4 +6,4 @@ permalink: "/community" --- Babka Social is not just a website, but a community that we're building together. It is the coming together of Jews from around the world to talk, support, celebrate, and discuss together. We come from a diversity of countries, a diversity of backgrounds and even beliefs, but we come together here as equals. -We invite you to [join us](/join). +We invite you to [join us]({{site.relativeurl}}/join). diff --git a/_pages/category/team.md b/_pages/category/team.md deleted file mode 100644 index 4a88546..0000000 --- a/_pages/category/team.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: "Team" -layout: team -category: community -permalink: "/teama" ---- -Babka Social is not just a website, but a community that we're building together. It is the coming together of Jews from around the world to talk, support, celebrate, and discuss together. We come from a diversity of countries, a diversity of backgrounds and even beliefs, but we come together here as equals. - -We invite you to [join us](/join). diff --git a/_pages/people.html b/_pages/people.html index 16da11a..cb18339 100644 --- a/_pages/people.html +++ b/_pages/people.html @@ -1,9 +1,9 @@ --- -title: "People" +title: "Team" layout: page-sidebar -permalink: "/people.html" +permalink: /people/ --- -{% assign people = site.data.people | sort %} +{% assign people = site.profile | sort %} <div class="container"> <h4 class="font-weight-bold spanborder text-zinc-900"><span>{{page.title}}</span></h4> <div class="row gap-y listrecent listrecent listauthor"> @@ -11,17 +11,19 @@ permalink: "/people.html" <div class="col-lg-6 mb-4"> <div class="p-4 border rounded shadow-xl"> <div class="row"> - <div class="col-md-3 mb-4 mb-md-0"><img alt="{{ person[1].name }}" src="{{ person[1].avatar | relative_url }}" class="rounded-circle" height="80" width="80"></div> + <div class="col-md-3 mb-4 mb-md-0"> + <img alt="{{ person.name }}" src="{{ person.avatar | relative_url }}" class="rounded-circle" height="80" width="80"> + </div> <div class="col-md-9"> - <a href="{{site.baseurl}}/people/{{ person[1].name | slugify }}"> - <h4 class="text-grey-dark mb-0"> {{ person[1].name }} </h4> + <a href="{{site.baseurl}}/people/{{ person.name | slugify }}"> + <h4 class="text-grey-dark mb-0"> {{ person.name }} </h4> <small class="d-inline-block mt-1 mb-3 font-weight-normal">(View Posts)</small> - <div class="excerpt">{{ person[1].bio }}</div> + <div class="excerpt">{{ person.bio }}</div> </a> <div class="icon-block mt-3 d-flex justify-content-between"> <div> - <a target="_blank" href="{{ person[1].twitter }}"><i class="fab fa-twitter text-muted" aria-hidden="true"></i></a> &nbsp; - <a target="_blank" href="{{ person[1].site }}"><i class="fa fa-globe text-muted" aria-hidden="true"></i></a> &nbsp; + <a target="_blank" href="{{ person.twitter }}"><i class="fab fa-twitter text-muted" aria-hidden="true"></i></a> &nbsp; + <a target="_blank" href="{{ person.site }}"><i class="fa fa-globe text-muted" aria-hidden="true"></i></a> &nbsp; </div> </div> </div> diff --git a/_pages/team.html b/_pages/team.html deleted file mode 100644 index a1223e1..0000000 --- a/_pages/team.html +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: "Team" -layout: page-sidebar -permalink: /team/ ---- -{% assign people = site.data.people | sort %} -<div class="container"> - <h4 class="font-weight-bold spanborder text-zinc-900"><span>{{page.title}}</span></h4> - <div class="row gap-y listrecent listrecent listauthor"> - {% for person in people %} - <div class="col-lg-6 mb-4"> - <div class="p-4 border rounded shadow-xl"> - <div class="row"> - <div class="col-md-3 mb-4 mb-md-0"><img alt="{{ person[1].name }}" src="{{ person[1].avatar | relative_url }}" class="rounded-circle" height="80" width="80"></div> - <div class="col-md-9"> - <a href="{{site.baseurl}}/people/{{ person[1].name | slugify }}"> - <h4 class="text-grey-dark mb-0"> {{ person[1].name }} </h4> - <small class="d-inline-block mt-1 mb-3 font-weight-normal">(View Posts)</small> - <div class="excerpt">{{ person[1].bio }}</div> - </a> - <div class="icon-block mt-3 d-flex justify-content-between"> - <div> - <a target="_blank" href="{{ person[1].twitter }}"><i class="fab fa-twitter text-muted" aria-hidden="true"></i></a> &nbsp; - <a target="_blank" href="{{ person[1].site }}"><i class="fa fa-globe text-muted" aria-hidden="true"></i></a> &nbsp; - </div> - </div> - </div> - </div> - </div> - </div> - {% endfor %} - </div> -</div> \ No newline at end of file diff --git a/_profile/serge.md b/_profile/serge.md index 6b892a3..177205c 100644 --- a/_profile/serge.md +++ b/_profile/serge.md @@ -1,8 +1,12 @@ --- title: "Serge" person: serge -avatar : "/assets/images/people/serge.jpg" - +avatar : "/assets/images/people/serge.jpg" +role: founder +social: +- title: gitlab + link: https://gitlab.com/emacsen + icon: fa fa-fw fa-gitlab --- I'm Serge and I'm the founder of Babka Social! diff --git a/_team/aschrijver.md b/_team/aschrijver.md deleted file mode 100644 index 03b4c34..0000000 --- a/_team/aschrijver.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Arnold Schrijver" -socialhub: aschrijver -role: owner -avatar : "/assets/images/people/arnold-schrijver.jpg" -social: -- title: github - link: "https://github.com/aschrijver" - icon: fa fa-github -- title: codeberg - link: "https://codeberg.org/circlebuilder" - icon: -- title: fediverse - link: "https://mastodon.social/@humanetech" - icon: fa fa-fw fa-mastodon ---- - -SocialHub moderator, Humane Tech Community admin, FOSS and fedi advocate, techie. \ No newline at end of file diff --git a/_team/sal.md b/_team/sal.md deleted file mode 100644 index 91dabb8..0000000 --- a/_team/sal.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "Salt" -person: sal2 ---- - -Hi folks. Salt here! \ No newline at end of file diff --git a/_team/serge.md b/_team/serge.md deleted file mode 100644 index 177205c..0000000 --- a/_team/serge.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: "Serge" -person: serge -avatar : "/assets/images/people/serge.jpg" -role: founder -social: -- title: gitlab - link: https://gitlab.com/emacsen - icon: fa fa-fw fa-gitlab ---- -I'm Serge and I'm the founder of Babka Social! - -I'm a technologist and a hacker in the Free/Open Source software world. - -I'm also a Jew, the grandson of a Holocaust survivor.

vosaul commented 2022-05-12 07:00:44 +00:00 (Migrated from gitlab.com)

Copy link

requested review from @emacsen

requested review from @emacsen

vosaul commented 2022-05-12 07:00:44 +00:00 (Migrated from gitlab.com)

Copy link

assigned to @vosaul

assigned to @vosaul

emacsen commented 2022-05-19 20:09:18 +00:00 (Migrated from gitlab.com)

Copy link

added 2 commits

• 0e88ad08 - 1 commit from branch dev
• 2972c0da - Merge branch 'dev' into 'vs-people-author'

Compare with previous version

added 2 commits <ul><li>0e88ad08 - 1 commit from branch <code>dev</code></li><li>2972c0da - Merge branch &#39;dev&#39; into &#39;vs-people-author&#39;</li></ul> [Compare with previous version](/babka_social/babka-social-blog/-/merge_requests/1/diffs?diff_id=398455682&start_sha=81d54c0353128ad9d49dacd253ea2693a29147c3)

emacsen (Migrated from gitlab.com) scheduled this pull request to auto merge when all checks succeed 2022-05-19 20:09:39 +00:00

vosaul commented 2022-05-22 21:14:16 +00:00 (Migrated from gitlab.com)

Copy link

aborted the automatic merge because source branch was updated

aborted the automatic merge because source branch was updated

vosaul commented 2022-05-22 21:14:16 +00:00 (Migrated from gitlab.com)

Copy link

added 2 commits

• b9724624 - people
• d8ea3286 - clean code from foundation, add placeholder

Compare with previous version

added 2 commits <ul><li>b9724624 - people</li><li>d8ea3286 - clean code from foundation, add placeholder</li></ul> [Compare with previous version](/babka_social/babka-social-blog/-/merge_requests/1/diffs?diff_id=399697539&start_sha=2972c0daba6e96465c04b707a83f3d8b4a2c9449)

vosaul commented 2022-05-22 21:42:04 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• b3dc2266 - remove Fedi Foundation from package.json

Compare with previous version

added 1 commit <ul><li>b3dc2266 - remove Fedi Foundation from package.json</li></ul> [Compare with previous version](/babka_social/babka-social-blog/-/merge_requests/1/diffs?diff_id=399701294&start_sha=d8ea32861561c332c4d077b385fc6b43eefb82c9)

vosaul (Migrated from gitlab.com) merged commit 435b9d14d3 into dev 2022-05-23 14:48:25 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Critical

  

Important

  

Low

  

Normal

No labels

Critical

Important

Low

Normal

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

babka/babka-social-blog!37

No description provided.