Commit 39467283 authored by mgabdev's avatar mgabdev

Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/frontend_refactor

parents e321c36c 589605c4
...@@ -352,7 +352,9 @@ class User < ApplicationRecord ...@@ -352,7 +352,9 @@ class User < ApplicationRecord
def set_unique_email def set_unique_email
user, domain = self.email.split('@') user, domain = self.email.split('@')
user = user.split('+').first user = user.split('+').first
user = user.gsub('.', '') if domain == 'gmail.com' if ((domain == 'gmail.com') || (domain == 'hotmail.com'))
user = user.gsub('.', '')
end
self.unique_email = "#{user}@#{domain}" self.unique_email = "#{user}@#{domain}"
end end
end end
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
.box-widget .box-widget
.rich-formatting .rich-formatting
%h2 Investors %h2 Investors
%p The Company is relying on the temporary final rules providing Relief for Form ID Filers and Regulation Crowdfunding and Regulation A Issuers Related to Coronavirus Disease 2019 (COVID-19). The Company is unable to timely file due to reduced capacity of service providers assisting with the preparation of our 2020 Annual Report.
%p %p
= link_to '2018 Annual Report', 'https://www.sec.gov/Archives/edgar/data/1709244/000114420419021378/tv519744_annualreport.pdf' = link_to '2018 Annual Report', 'https://www.sec.gov/Archives/edgar/data/1709244/000114420419021378/tv519744_annualreport.pdf'
%p %p
......
...@@ -5,14 +5,16 @@ ...@@ -5,14 +5,16 @@
.box-widget .box-widget
.rich-formatting .rich-formatting
%h1 GAB AI INC %h1 GAB AI INC
%h2 PRIVACY POLICY %h2 Privacy Policy
%h3 DATE: 24 JUNE 2019 %h3 Last Updated: 10 April 2020
%p GAB AI INC (”Company” or “We”) respect your privacy and are committed to protecting it through our compliance with this policy. %p GAB AI INC (”Company” or “We”) respect your privacy and are committed to protecting it through our compliance with this policy.
%p %p
This policy describes the types of information we may collect from you or that you may provide when you visit the website This policy describes the types of information we may collect from you or that you may provide when you visit the website
= link_to 'GAB.COM', 'https://gab.com' = link_to 'GAB.COM', 'https://gab.com'
, ,
= link_to 'ON.GAB.COM', 'https://ongab.com'
,
= link_to 'DISSENTER.COM', 'https://dissenter.com' = link_to 'DISSENTER.COM', 'https://dissenter.com'
and any other online properties of Gab AI Inc (each a “Website”) and our practices for collecting, using, maintaining, protecting, and disclosing that information. and any other online properties of Gab AI Inc (each a “Website”) and our practices for collecting, using, maintaining, protecting, and disclosing that information.
......
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
.content .content
.box-widget .box-widget
.rich-formatting .rich-formatting
%h1 GAB AI INC
%h2 Terms of Sale %h2 Terms of Sale
%p Gab AI Inc (“We” or “Gab”) hereby allow you to access certain premium features or content in exchange for a one-time or recurring fee, as applicable to the relevant features or content, such as our “GabPro” enhanced social media offering (collectively, each a “Paid Service” and collectively the "Paid Services"). Your transactions and any other use of the Paid Services are subject to these Gab Paid Service Terms of Service ("Terms”). %h3 Last Updated: 10 April 2020
%p Gab AI Inc (“We” or “Gab”) hereby allow you to access certain premium features or content in exchange for a one-time or recurring fee, as applicable to the relevant features or content, such as our “GabPro” enhanced social media offering, our Dissenter Shop, or On Gab web teleconferencing service (each a “Paid Service” and collectively the "Paid Services"). Your transactions and any other use of the Paid Services are subject to these Gab Paid Service Terms of Sale ("Terms”).
%h3 1. Your Acceptance %h3 1. Your Acceptance
%p %p
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment