Merge branch 'main' into development

Author: pengyin-shan

README.md

@@ -19,8 +19,8 @@ Click here for the latest [releases](https://github.com/DMPRoadmap/roadmap/relea
 
 #### Pre-requisites
 Roadmap is a Ruby on Rails application and you will need to have:
-* Ruby = 2.4.0 - 2.4.4
-* Rails = 4.2
+* Ruby = 2.7.6
+* Rails = 6.1
 * MySQL >= 5.0 OR PostgreSQL
 
 Further detail on how to install Ruby on Rails applications are available from the Ruby on Rails site: http://rubyonrails.org.

app/helpers/perms_helper.rb

@@ -14,7 +14,7 @@ def name_and_text
       use_api: _('API rights'),
       change_org_details: _('Manage organisation details'),
       grant_api_to_orgs: _('Grant API to organisations'),
-      review_org_plans: _('')
+      review_org_plans: _('Review organisational plans')
     }
   end
 end

app/views/orgs/_profile_form.html.erb

@@ -80,7 +80,7 @@
                    links: org.links.fetch("org", []),
                    max_number_links: Rails.configuration.x.max_number_links_funder,
                    tooltip: shared_links_tooltip }) %>
-      <%= hidden_field_tag('org_links', value: org.links) %>
+      <%= hidden_field_tag('org_links', org.links) %>
     </div>
   </div>