From 0bcb47a937de5c03b329c5f78dbbbfe142eeebcf Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 11 Jun 2019 15:08:04 -0700
Subject: [PATCH 1/4] stubbed new ror heartbeat check

---
 spec/mocks/ror.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spec/mocks/ror.rb b/spec/mocks/ror.rb
index 7fd8ea4b..1fb3aaa7 100644
--- a/spec/mocks/ror.rb
+++ b/spec/mocks/ror.rb
@@ -7,6 +7,17 @@ def mock_ror!(user = nil)
       stub_ror_id_lookup(university: user.present? && user.affiliation.present? ? user.affiliation.long_name : nil)
     end
 
+    def stub_ror_heartbeat_check
+      stub_request(:get, "https://api.ror.org/heartbeat")
+        .with(
+           headers: {
+          'Accept'=>'*/*',
+          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'User-Agent'=>'Ruby'
+           })
+        .to_return(status: 200, body: "", headers: {})
+    end
+
     # rubocop:disable Metrics/MethodLength
     def stub_ror_id_lookup(university: Faker::Educator.university, country: 'United States of America')
       # Mock a request for a specific ROR Organization

From b3f7a1bf731ccc5e81f5eeebbb6b417473ff65d7 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 11 Jun 2019 15:18:40 -0700
Subject: [PATCH 2/4] fixed issue with ror mock

---
 spec/mocks/ror.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/mocks/ror.rb b/spec/mocks/ror.rb
index 1fb3aaa7..4c32f07b 100644
--- a/spec/mocks/ror.rb
+++ b/spec/mocks/ror.rb
@@ -3,6 +3,7 @@ module Mocks
   module Ror
 
     def mock_ror!(user = nil)
+      stub_ror_heartbeat_check
       stub_ror_name_lookup(name: user.present? && user.affiliation.present? ? user.affiliation.long_name : nil)
       stub_ror_id_lookup(university: user.present? && user.affiliation.present? ? user.affiliation.long_name : nil)
     end

From 77f62a3c6a95abd3f3fa7bf708c1f13281444dab Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 11 Jun 2019 15:27:11 -0700
Subject: [PATCH 3/4] fixed rubocop

---
 spec/mocks/ror.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/spec/mocks/ror.rb b/spec/mocks/ror.rb
index 4c32f07b..7693703f 100644
--- a/spec/mocks/ror.rb
+++ b/spec/mocks/ror.rb
@@ -9,14 +9,15 @@ def mock_ror!(user = nil)
     end
 
     def stub_ror_heartbeat_check
-      stub_request(:get, "https://api.ror.org/heartbeat")
+      stub_request(:get, 'https://api.ror.org/heartbeat')
         .with(
-           headers: {
-          'Accept'=>'*/*',
-          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-          'User-Agent'=>'Ruby'
-           })
-        .to_return(status: 200, body: "", headers: {})
+          headers: {
+            'Accept' => '*/*',
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+            'User-Agent' => 'Ruby'
+          }
+        )
+        .to_return(status: 200, body: '', headers: {})
     end
 
     # rubocop:disable Metrics/MethodLength

From fe73d1efad4b66bfcf2230081648d6b277ae9889 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 12 Jun 2019 10:42:29 -0700
Subject: [PATCH 4/4] added new UCLA logo

---
 public/images/logo_ucla.svg | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
 mode change 100644 => 100755 public/images/logo_ucla.svg

diff --git a/public/images/logo_ucla.svg b/public/images/logo_ucla.svg
old mode 100644
new mode 100755
index e249e0ad..885cb23b
--- a/public/images/logo_ucla.svg
+++ b/public/images/logo_ucla.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="161.625px" height="52px" viewBox="9.775 10.7 161.625 52" enable-background="new 9.775 10.7 161.625 52"
-	 xml:space="preserve">
-<g>
-	<path fill="#3184C0" d="M38.2,43c-0.6,5.7-4,10.3-10.5,10.3c-6.4,0-8.9-4.5-8.3-10.899L22,12.9h-9.6L9.8,42.1
-		c0,1.2-0.1,3.7,0.1,5.4c1.2,8.9,7.3,15.1,16.9,15.1c12.3,0,19.9-8.6,20.9-20l2.6-29.7h-9.6L38.2,43"/>
-	<path fill="#3184C0" d="M54.3,37.6C53.1,50.7,60.5,62.7,76.7,62.7C81,62.7,85.4,61.6,90,59l1.1-11.9c-4.8,4.801-9.3,6-13.6,6
-		c-9.8,0-14.3-7.1-13.6-15.8c0.8-8.9,6.4-16,16.5-16c4.1,0,8.6,0.8,12.4,5.8L93.9,15.5C89.8,13,85.6,12,81.3,12
-		C65,12,55.5,23.6,54.3,37.6"/>
-	<path fill="#3184C0" d="M107.6,52.5l3.5-39.6h-9.5l-4.3,48.7h28.3c0,0,0.801-8.699,0.9-9.199c-0.9,0.1-4.1,0.1-5.1,0.1
-		C120.8,52.5,107.6,52.5,107.6,52.5"/>
-	<path fill="#3184C0" d="M153.6,10.7H152.9L126.8,61.6H137l3.7-7.699H159l2.3,7.699H171.4L153.6,10.7 M144.6,45.6
-		c0,0,6.4-14.2,6.601-14.6c0.3-0.7,0.6-1.5,0.7-2h0.1c0.1,0.6,0.2,1.3,0.4,2.1c0.5,2.2,4.199,14.5,4.199,14.5H144.6z"/>
-</g>
-</svg>
+<svg id="ucla-box-black" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 168.84"><defs><style>.cls-1{fill:#2774ae;}.cls-2{fill:#fff;}</style></defs><title>logo_UCLA_blue_boxed</title><rect class="cls-1" width="360" height="168.84"/><path class="cls-2" d="M57.57,100.65a72.15,72.15,0,0,1-.18-8.51l4.06-46H76.52L72.39,92.54c-.89,10,3,17.22,13.08,17.22,10.26,0,15.68-7.29,16.57-16.21l4.28-47.44h15.06L117.21,93c-1.68,18-13.64,31.54-33,31.54-15.08,0-24.8-9.75-26.65-23.85" transform="translate(0 0)"/><path class="cls-2" d="M124.84,85.07c2-22.1,16.87-40.42,42.62-40.42a35.32,35.32,0,0,1,19.79,5.73l-1.72,18.25c-5.94-7.81-13-9.08-19.51-9.08-16,0-24.81,11.13-26.07,25.22-1.21,13.71,5.87,24.87,21.39,24.87,6.78,0,14-2,21.48-9.47l-1.66,18.73c-7.33,4-14.14,5.78-21,5.78-25.48,0-37.15-18.93-35.32-39.61" transform="translate(0 0)"/><path class="cls-2" d="M199.28,46.11h15l-5.48,62.5h21.53c1.52,0,6.65-.08,8-.16-.08.75-1.37,14.44-1.37,14.44H192.46Z" transform="translate(0 0)"/><path class="cls-2" d="M277.57,74.77a18,18,0,0,0,1.11-3.22h.24a18.25,18.25,0,0,0,.57,3.25c.83,3.5,6.68,22.94,6.68,22.94h-19s10.17-22.46,10.37-23m3.85-32.18-1,0-41.15,80.28h16L261,110.71h29l3.62,12.18h15.93Z" transform="translate(0 0)"/></svg>
\ No newline at end of file