merge conflicts

README.FLIPBOARD

@@ -0,0 +1,17 @@
+- added updater_post_install.sh script
+- added jenkins build script
+
+##############
+# To sync fork
+##############
+$ git fetch upstream
+$ git checkout main
+$ git merge upstream/main
+$ git push
+
+##############
+# To get tags from upstream
+##############
+$ git fetch --tags upstream
+$ git push --tags
+

app/controllers/auth/registrations_controller.rb

@@ -55,7 +55,7 @@ def build_resource(hash = nil)
 
   def configure_sign_up_params
     devise_parameter_sanitizer.permit(:sign_up) do |user_params|
-      user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
+      user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text, :flipboard_username] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
     end
   end
 

app/helpers/branding_helper.rb

@@ -11,7 +11,7 @@ def logo_as_symbol(version = :icon)
   end
 
   def _logo_as_symbol_wordmark
-    content_tag(:svg, tag.use(href: '#logo-symbol-wordmark'), viewBox: '0 0 261 66', class: 'logo logo--wordmark')
+    content_tag(:svg, tag.use(href: '#logo-symbol-wordmark'), viewBox: '0 0 500 500', class: 'logo logo--wordmark')
   end
 
   def _logo_as_symbol_icon