From e42c7d2d71b38fb55c1815b5465d7a1ad8c1f8fb Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Thu, 7 Apr 2022 18:02:46 -0400 Subject: [PATCH 1/2] fix invitation link org selector --- CHANGELOG.md | 3 +++ app/views/devise/invitations/edit.html.erb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c20852ee7..ab17c09c91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### Fixed + +- Fixed invalid org selection when new user accept invitation [#177](https://github.com/portagenetwork/roadmap/issues/177) ## [3.0.4+portage-3.0.7] - 2022-04-05 ### Added diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index 4efaa8acd5..c10d495d4b 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -34,7 +34,7 @@ form: f, default_org: nil, required: true, - orgs: @orgs + orgs: @all_orgs } %> <%= f.button(_('Create account'), class: "btn btn-default", type: "submit") %> From 6925360ee6fee99db998c94d79daf4795550b047 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Fri, 8 Apr 2022 10:57:26 -0400 Subject: [PATCH 2/2] update changelog for 3.0.8 release --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab17c09c91..47045d7808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## [3.0.4+portage-3.0.8] - 2022-04-08 + ### Fixed - Fixed invalid org selection when new user accept invitation [#177](https://github.com/portagenetwork/roadmap/issues/177)