Skip to content

Commit ae33fe9

Browse files
OctomergerOctomerger
authored
repo sync
2 parents b224b05 + d743ff9 commit ae33fe9

5 files changed

Lines changed: 18 additions & 23 deletions

File tree

‎includes/footer.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
<div class="container-xl px-3 px-md-6">
33
<div class="d-flex flex-wrap py-5 mb-5">
44
<div class="col-12 col-lg-4 mb-5">
5-
<a href="https://github.com/" data-ga-click="Footer, go to home, text:home" class="text-gray-dark" aria-label="Go to GitHub homepage">
5+
<a href="https://github.com/" class="text-gray-dark" aria-label="Go to GitHub homepage">
66
{% octicon "logo-github" height="30" %}
77
</a>
88
</div>
99
<div class="col-6 col-sm-3 col-lg-2 mb-6 mb-md-2 pr-3 pr-lg-0 pl-lg-4">
1010
<h4 class="mb-3 text-mono text-gray-light text-normal">{% data ui.footer.product.heading %}</h4>
1111
<ul class="list-style-none text-gray f5">
12-
<li class="lh-condensed mb-3"><a href="https://github.com/features" data-ga-click="Footer, go to features, text:features" class="link-gray">{% data ui.footer.product.links.features %}</a></li>
13-
<li class="lh-condensed mb-3"><a href="https://github.com/security" data-ga-click="Footer, go to security, text:security" class="link-gray">{% data ui.footer.product.links.security %}</a></li>
14-
<li class="lh-condensed mb-3"><a href="https://github.com/enterprise" data-ga-click="Footer, go to enterprise, text:enterprise" class="link-gray">{% data ui.footer.product.links.enterprise %}</a></li>
15-
<li class="lh-condensed mb-3"><a href="https://github.com/case-studies?type=customers" data-ga-click="Footer, go to case studies, text:case studies" class="link-gray">{% data ui.footer.product.links.case_studies %}</a></li>
16-
<li class="lh-condensed mb-3"><a href="https://github.com/pricing" data-ga-click="Footer, go to pricing, text:pricing" class="link-gray">{% data ui.footer.product.links.pricing %}</a></li>
17-
<li class="lh-condensed mb-3"><a href="https://resources.github.com" data-ga-click="Footer, go to resources, text:resources" class="link-gray">{% data ui.footer.product.links.resources %}</a></li>
12+
<li class="lh-condensed mb-3"><a href="https://github.com/features" class="link-gray">{% data ui.footer.product.links.features %}</a></li>
13+
<li class="lh-condensed mb-3"><a href="https://github.com/security" class="link-gray">{% data ui.footer.product.links.security %}</a></li>
14+
<li class="lh-condensed mb-3"><a href="https://github.com/enterprise" class="link-gray">{% data ui.footer.product.links.enterprise %}</a></li>
15+
<li class="lh-condensed mb-3"><a href="https://github.com/case-studies?type=customers" class="link-gray">{% data ui.footer.product.links.case_studies %}</a></li>
16+
<li class="lh-condensed mb-3"><a href="https://github.com/pricing" class="link-gray">{% data ui.footer.product.links.pricing %}</a></li>
17+
<li class="lh-condensed mb-3"><a href="https://resources.github.com" class="link-gray">{% data ui.footer.product.links.resources %}</a></li>
1818
</ul>
1919
</div>
2020
<div class="col-6 col-sm-3 col-lg-2 mb-6 mb-md-2 pr-3 pr-md-0 pl-md-4">
2121
<h4 class="mb-3 text-mono text-gray-light text-normal">{% data ui.footer.platform.heading %}</h4>
2222
<ul class="list-style-none f5">
23-
<li class="lh-condensed mb-3"><a href="https://developer.github.com/" data-ga-click="Footer, go to api, text:api" class="link-gray">{% data ui.footer.platform.links.developer_api %}</a></li>
24-
<li class="lh-condensed mb-3"><a href="http://partner.github.com/" data-ga-click="Footer, go to partner, text:partner" class="link-gray">{% data ui.footer.platform.links.partners %}</a></li>
25-
<li class="lh-condensed mb-3"><a href="https://atom.io" data-ga-click="Footer, go to atom, text:atom" class="link-gray">{% data ui.footer.platform.links.atom %}</a></li>
26-
<li class="lh-condensed mb-3"><a href="http://electron.atom.io/" data-ga-click="Footer, go to electron, text:electron" class="link-gray">{% data ui.footer.platform.links.electron %}</a></li>
27-
<li class="lh-condensed mb-3"><a href="https://desktop.github.com/" data-ga-click="Footer, go to desktop, text:desktop" class="link-gray">{% data ui.footer.platform.links.github_desktop %}</a></li>
23+
<li class="lh-condensed mb-3"><a href="https://developer.github.com/" class="link-gray">{% data ui.footer.platform.links.developer_api %}</a></li>
24+
<li class="lh-condensed mb-3"><a href="http://partner.github.com/" class="link-gray">{% data ui.footer.platform.links.partners %}</a></li>
25+
<li class="lh-condensed mb-3"><a href="https://atom.io" class="link-gray">{% data ui.footer.platform.links.atom %}</a></li>
26+
<li class="lh-condensed mb-3"><a href="http://electron.atom.io/" class="link-gray">{% data ui.footer.platform.links.electron %}</a></li>
27+
<li class="lh-condensed mb-3"><a href="https://desktop.github.com/" class="link-gray">{% data ui.footer.platform.links.github_desktop %}</a></li>
2828
</ul>
2929
</div>
3030
<div class="col-6 col-sm-3 col-lg-2 mb-6 mb-md-2 pr-3 pr-md-0 pl-md-4">

‎javascripts/search.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const maxContentLength = 300
1414
const hasStandaloneSearch = () => document.getElementById('landing') || document.querySelector('body.error-404') !== null
1515

1616
const resultTemplate = (item) => {
17-
// Attach an `algolia-query` param to each result link so Google Analytics
17+
// Attach an `algolia-query` param to each result link so analytics
1818
// can track the search query that led the user to this result
1919
const input = document.querySelector('#search-input-container input')
2020
if (input) {
@@ -189,12 +189,12 @@ export default function () {
189189
searchWithYourKeyboard('#search-input-container input', '.ais-Hits-item')
190190
toggleSearchDisplay()
191191

192-
// delay removal of the query param so Google Analytics client code has a chance to track it
192+
// delay removal of the query param so analytics client code has a chance to track it
193193
setTimeout(() => { removeAlgoliaQueryTrackingParam() }, 500)
194194
}
195195

196-
// When a user performs an in-site search an `agolia-query` param is
197-
// added to the URL so Google Analytics can track the queries and the pages
196+
// When a user performs an in-site search an `algolia-query` param is
197+
// added to the URL so analytics can track the queries and the pages
198198
// they lead to. This function strips the query from the URL after page load,
199199
// so the bare article URL can be copied/bookmarked/shared, sans tracking param
200200
function removeAlgoliaQueryTrackingParam () {

‎middleware/csp.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module.exports = contentSecurityPolicy({
88
defaultSrc: ["'none'"],
99
connectSrc: [
1010
"'self'",
11-
'*.google-analytics.com',
1211
'*.algolia.net',
1312
'*.algolianet.com'
1413
],
@@ -19,7 +18,6 @@ module.exports = contentSecurityPolicy({
1918
],
2019
imgSrc: [
2120
"'self'",
22-
'*.google-analytics.com',
2321
'github.githubassets.com',
2422
'github-images.s3.amazonaws.com',
2523
'octodex.github.com',
@@ -32,8 +30,7 @@ module.exports = contentSecurityPolicy({
3230
"'self'",
3331
'data:',
3432
"'unsafe-eval'", // exception for Algolia instantsearch
35-
"'unsafe-inline'",
36-
'*.google-analytics.com'
33+
"'unsafe-inline'"
3734
],
3835
frameSrc: [ // exceptions for GraphQL Explorer
3936
'https://graphql-explorer.githubapp.com', // production env

‎tests/rendering/server.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,12 @@ describe('server', () => {
4949
expect(csp.get('connect-src').includes('*.algolianet.com')).toBe(true)
5050

5151
expect(csp.get('img-src').includes("'self'")).toBe(true)
52-
expect(csp.get('img-src').includes('*.google-analytics.com')).toBe(true)
5352
expect(csp.get('img-src').includes('github-images.s3.amazonaws.com')).toBe(true)
5453
expect(csp.get('img-src').includes('octodex.github.com')).toBe(true)
5554

5655
expect(csp.get('script-src').includes("'self'")).toBe(true)
5756
expect(csp.get('script-src').includes("'unsafe-eval'")).toBe(true) // exception for Algolia instantsearch
5857
expect(csp.get('script-src').includes("'unsafe-inline'")).toBe(true)
59-
expect(csp.get('script-src').includes('*.google-analytics.com')).toBe(true)
6058

6159
expect(csp.get('style-src').includes("'self'")).toBe(true)
6260
expect(csp.get('style-src').includes("'unsafe-inline'")).toBe(true)

‎tests/routing/top-developer-site-path-redirects.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { head } = require('../helpers')
33
describe('developer.github.com redirects', () => {
44
jest.setTimeout(30 * 60 * 1000)
55

6-
it('responds with 200 for the top historical request paths from google analytics', async () => {
6+
it('responds with 200 for the top historical request paths', async () => {
77
// ignore paths that are not (yet?) being redirected from developer.github.com to docs.github.com
88
const ignoredPatterns = [
99
/^\/changes/,

0 commit comments

Comments
 (0)