Skip to content

Commit

Permalink
Merge branch 'integration' into rename_seed_file
Browse files Browse the repository at this point in the history
  • Loading branch information
portagenetwork authored Apr 11, 2022
2 parents ed24537 + 3844b41 commit 143b24d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,4 +280,4 @@
- Fix 500 error when downloading usage statistics
- Fix name of downloaded usage file
- Allow organizational admin to see the download button in 'Statisctics on Users' and 'Statistics on Tempalte' accordions
- Upgrade node-sass to 7, node to 12 and adjust eslint test to use Github default action
- Upgrade node-sass to 7, node to 12 and adjust eslint test to use Github default action
2 changes: 1 addition & 1 deletion app/views/devise/invitations/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
form: f,
default_org: nil,
required: true,
orgs: @orgs
orgs: @all_orgs
} %>
</div>
<%= f.button(_('Create account'), class: "btn btn-default", type: "submit") %>
Expand Down

0 comments on commit 143b24d

Please sign in to comment.