Merge branch 'release-0.37'

Release v0.37: open.ly domain name **Enhancements:** - Change domain name from openly.one to open.ly
OpenlyOne · May 15, 2019 · be278d6 · be278d6
2 parents 808ef77 + e65f3ed
commit be278d6
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ env:
   global:
     - CI=true
     - ALL_TESTS=true
-    - APPLICATION_DOMAIN=openly.one
+    - APPLICATION_DOMAIN=open.ly
     - GOOGLE_DRIVE_TRACKING_ACCOUNT=example.one@gmail.com
     - GOOGLE_DRIVE_USER_ACCOUNT=example.two@gmail.com
     - GOOGLE_DRIVE_COLLABORATOR_ACCOUNT=example.three@gmail.com

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v0.37 (May 15, 2019)
+
+**Enhancements:**
+- Change domain name from openly.one to open.ly
+
 ## v0.36.4 (Mar 5, 2019)
 
 **Fixes:**

diff --git a/app/assets/images/projects/sharing-settings.jpg b/app/assets/images/projects/sharing-settings.jpg
diff --git a/app/views/static/github_for_documents/index.slim b/app/views/static/github_for_documents/index.slim
@@ -279,7 +279,7 @@
 
       .col.s6.l4
         p
-          = mail_to 'hello@openly.one', nil, class: 'white-text'
+          = mail_to 'hello@open.ly', nil, class: 'white-text'
           br
           br
           | Incorporated in Delaware.

diff --git a/app/views/static/open_collaboration/index.slim b/app/views/static/open_collaboration/index.slim
@@ -75,7 +75,7 @@
 
       .col.s6.l4
         p
-          = mail_to 'hello@openly.one', nil, class: 'white-text'
+          = mail_to 'hello@open.ly', nil, class: 'white-text'
           br
           br
           | We are a public benefit corporation &hearts;

diff --git a/config/nginx.conf b/config/nginx.conf
@@ -4,10 +4,10 @@ upstream puma {
 
 server {
   listen 443 ssl;
-  server_name www.openly.one;
-  ssl_certificate /etc/letsencrypt/live/www.openly.one/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/www.openly.one/privkey.pem;
-  ssl_trusted_certificate /etc/letsencrypt/live/www.openly.one/fullchain.pem;
+  server_name www.open.ly;
+  ssl_certificate /etc/letsencrypt/live/www.open.ly/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/www.open.ly/privkey.pem;
+  ssl_trusted_certificate /etc/letsencrypt/live/www.open.ly/fullchain.pem;
   ssl_dhparam /etc/ssl/certs/dhparam.pem;
   ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
   ssl_ciphers HIGH:!aNULL:!MD5;
@@ -37,37 +37,37 @@ server {
   keepalive_timeout 10;
 }
 
-# Redirect https requests from openly.one to www.openly.one
+# Redirect https requests from open.ly to www.open.lye
 server {
   listen 443 ssl;
-  server_name openly.one;
-  ssl_certificate /etc/letsencrypt/live/openly.one/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/openly.one/privkey.pem;
-  return 301 https://www.openly.one$request_uri;
+  server_name open.ly;
+  ssl_certificate /etc/letsencrypt/live/open.ly/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/open.ly/privkey.pem;
+  return 301 https://www.open.ly$request_uri;
 }
 
-# Redirect https requests from www.upshift.one to www.openly.one
+# Redirect https requests from www.openly.one to www.open.ly
 server {
   listen 443 ssl;
-  server_name www.upshift.one;
-  ssl_certificate /etc/letsencrypt/live/www.upshift.one/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/www.upshift.one/privkey.pem;
-  return 301 https://www.openly.one$request_uri;
+  server_name www.openly.one;
+  ssl_certificate /etc/letsencrypt/live/www.openly.one/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/www.openly.one/privkey.pem;
+  return 301 https://www.open.ly$request_uri;
 }
 
-# Redirect https requests from upshift.one to www.openly.one
+# Redirect https requests from openly.one to www.open.ly
 server {
   listen 443 ssl;
-  server_name upshift.one;
-  ssl_certificate /etc/letsencrypt/live/upshift.one/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/upshift.one/privkey.pem;
-  return 301 https://www.openly.one$request_uri;
+  server_name openly.one;
+  ssl_certificate /etc/letsencrypt/live/openly.one/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/openly.one/privkey.pem;
+  return 301 https://www.open.ly$request_uri;
 }
 
-# Redirect all http requests to https://www.openly.one/
+# Redirect all http requests to https://www.open.ly/
 server {
   listen 80 default_server;
   server_name _;
 
-  return 301 https://www.openly.one$request_uri;
+  return 301 https://www.open.ly$request_uri;
 }
diff --git a/spec/mailers/notifications_mailer_spec.rb b/spec/mailers/notifications_mailer_spec.rb
@@ -30,7 +30,7 @@
     end
 
     it 'sets the correct sender' do
-      expect(mail.from).to contain_exactly 'notification@openly.one'
+      expect(mail.from).to contain_exactly 'notification@open.ly'
       expect(mail[:from].display_names).to contain_exactly 'Openly'
     end
 

diff --git a/spec/views/errors/internal_server_error.html.erb_spec.rb b/spec/views/errors/internal_server_error.html.erb_spec.rb
@@ -8,6 +8,6 @@
 
   it 'provides a contact email address' do
     render
-    expect(rendered).to have_selector('a', text: 'hello@openly.one')
+    expect(rendered).to have_selector('a', text: 'hello@open.ly')
   end
 end
diff --git a/spec/views/errors/not_found.html.erb_spec.rb b/spec/views/errors/not_found.html.erb_spec.rb
@@ -8,6 +8,6 @@
 
   it 'provides a contact email address' do
     render
-    expect(rendered).to have_selector('a', text: 'hello@openly.one')
+    expect(rendered).to have_selector('a', text: 'hello@open.ly')
   end
 end
diff --git a/spec/views/errors/unacceptable.html.erb_spec.rb b/spec/views/errors/unacceptable.html.erb_spec.rb
@@ -8,6 +8,6 @@
 
   it 'provides a contact email address' do
     render
-    expect(rendered).to have_selector('a', text: 'hello@openly.one')
+    expect(rendered).to have_selector('a', text: 'hello@open.ly')
   end
 end