Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

URL Cleanup #163

Open
spring-operator wants to merge 1 commit into
base: main
Choose a base branch
from
Open

URL Cleanup #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/resources/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layouts/main">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layouts/main">
<head>
<title>About</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/admin/cla/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main" th:with="isEditCla=${claForm.id != null}">
<head>
<title th:text="${isEditCla ? 'Edit CLA' : 'Create CLA'}">Create CLA</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/admin/cla/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Manage CLAs</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/admin/cla/link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layouts/main">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layouts/main">
<head>
<title>Link to CLA</title>
<!-- Docs CSS -->
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/admin/help/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Admin Help</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/admin/help/migrate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Migrating</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/cla/ccla/sign.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Sign CCLA</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/cla/ccla/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Sign CCLA</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/cla/icla/sign.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Sign ICLA</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/cla/icla/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>View ICLA</title>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layouts/main">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layouts/main">
<head>
<title>Error</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/error/403.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layouts/main">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layouts/main">
<head>
<title>Access Denied</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layouts/main">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layouts/main">
<head>
<title>Home</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/layouts/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/sync/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
layout:decorator="layouts/main">
<head>
<title>Sync Pull Request</title>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/pivotal/cla/config/ClaOAuthConfigTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void getGitHubApiBaseUrl() {
public void getGitHubApiBaseUrlCustomSchemePort() {
config.setScheme("http");
config.setPort(1234);
assertThat(config.getGitHubApiBaseUrl()).isEqualTo("http://api.github.com:1234/");
assertThat(config.getGitHubApiBaseUrl()).isEqualTo("https://api.github.com:1234/");
}

@Test
Expand All @@ -57,7 +57,7 @@ public void getGitHubBaseUrl() {
public void getGitHubBaseUrlCustomSchemePort() {
config.setScheme("http");
config.setPort(1234);
assertThat(config.getGitHubBaseUrl()).isEqualTo("http://github.com:1234/");
assertThat(config.getGitHubBaseUrl()).isEqualTo("https://github.com:1234/");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/pivotal/cla/service/github/MylynGitHubApiITests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ public void markdownToHtml() {

String html = service.markdownToHtml(accessToken, markdown);

assertThat(html).isEqualTo("<p>Hello world <a href=\"http://github.com/github/linguist/issues/1\" class=\"issue-link\" title=\"This is a simple issue\">github/linguist#1</a> <strong>cool</strong>, and <a href=\"http://github.com/github/gollum/issues/1\" class=\"issue-link\" title=\"This is another issue\">#1</a>!</p>");
assertThat(html).isEqualTo("<p>Hello world <a href=\"https://github.com/github/linguist/issues/1\" class=\"issue-link\" title=\"This is a simple issue\">github/linguist#1</a> <strong>cool</strong>, and <a href=\"https://github.com/github/gollum/issues/1\" class=\"issue-link\" title=\"This is another issue\">#1</a>!</p>");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...sources/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/createPullRequestHooks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ X-RateLimit-Remaining: 4999
],
"active": true,
"config": {
"url": "http://example.com/webhook",
"url": "https://example.com/webhook",
"content_type": "json"
},
"updated_at": "2011-09-06T20:39:23Z",
Expand Down
2 changes: 1 addition & 1 deletion ...rces/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/createPullRequestHooks456
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ X-RateLimit-Remaining: 4999
],
"active": true,
"config": {
"url": "http://example.com/webhook",
"url": "https://example.com/webhook",
"content_type": "json"
},
"updated_at": "2011-09-06T20:39:23Z",
Expand Down
6 changes: 3 additions & 3 deletions .../resources/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/findRepositoryNames
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ OkHttp-ChunkedBody: 256
"has_issues": false,
"has_pages": true,
"has_wiki": true,
"homepage": "http://projects.spring.io/spring-framework",
"homepage": "https://projects.spring.io/spring-framework",
"hooks_url": "https://api.github.com/repos/spring-projects/spring-framework/hooks",
"html_url": "https://github.com/spring-projects/spring-framework",
"id": 1148753,
Expand Down Expand Up @@ -172,7 +172,7 @@ OkHttp-ChunkedBody: 256
"has_issues": true,
"has_pages": true,
"has_wiki": true,
"homepage": "http://spring.io/spring-security",
"homepage": "https://spring.io/spring-security",
"hooks_url": "https://api.github.com/repos/spring-projects/spring-security/hooks",
"html_url": "https://github.com/spring-projects/spring-security",
"id": 3148979,
Expand Down Expand Up @@ -286,7 +286,7 @@ OkHttp-ChunkedBody: 256
"has_issues": false,
"has_pages": true,
"has_wiki": true,
"homepage": "http://projects.spring.io/spring-nopermission",
"homepage": "https://projects.spring.io/spring-nopermission",
"hooks_url": "https://api.github.com/repos/spring-projects/spring-nopermission/hooks",
"html_url": "https://github.com/spring-projects/spring-nopermission",
"id": 1148753,
Expand Down
2 changes: 1 addition & 1 deletion ...sources/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/getContributingUrls200
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ X-XSS-Protection: 1; mode=block

<!DOCTYPE html>
<html lang="en" class="">
<head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# object: http://ogp.me/ns/object# article: http://ogp.me/ns/article# profile: http://ogp.me/ns/profile#">
<head prefix="og: http://ogp.me/# fb: https://graph.facebook.com/schema/og/# object: https://graph.facebook.com/schema/og/object# article: https://graph.facebook.com/schema/og/article# profile: https://graph.facebook.com/schema/og/profile#">
<meta charset='utf-8'>

<link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/frameworks-54aeed08c47ba4f0908a16861703c64db9718fe942a5b26c4c36572c0ace5563.css" media="all" rel="stylesheet" />
Expand Down
2 changes: 1 addition & 1 deletion ...rces/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/getUserPivotalIssueMaster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ X-XSS-Protection: 1; mode=block
{
"avatar_url": "https://avatars.githubusercontent.com/u/362503?v=3",
"bio": null,
"blog": "http://spring.io/team/rwinch",
"blog": "https://spring.io/team/rwinch",
"collaborators": 0,
"company": "Pivotal",
"created_at": "2010-08-12T18:08:04Z",
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/getUserRwinch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ X-XSS-Protection: 1; mode=block
{
"avatar_url": "https://avatars.githubusercontent.com/u/362503?v=3",
"bio": null,
"blog": "http://spring.io/team/rwinch",
"blog": "https://spring.io/team/rwinch",
"collaborators": 0,
"company": "Pivotal",
"created_at": "2010-08-12T18:08:04Z",
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/markdownToHtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Content-Type: text/html
X-RateLimit-Limit: 5000
X-RateLimit-Remaining: 4999

<p>Hello world <a href="http://github.com/github/linguist/issues/1" class="issue-link" title="This is a simple issue">github/linguist#1</a> <strong>cool</strong>, and <a href="http://github.com/github/gollum/issues/1" class="issue-link" title="This is another issue">#1</a>!</p>
<p>Hello world <a href="https://github.com/github/linguist/issues/1" class="issue-link" title="This is a simple issue">github/linguist#1</a> <strong>cool</strong>, and <a href="https://github.com/github/gollum/issues/1" class="issue-link" title="This is another issue">#1</a>!</p>
2 changes: 1 addition & 1 deletion ...sources/io/pivotal/cla/service/github/MylynGitHubApiITests_okhttp3/updatePullRequestHooks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ X-RateLimit-Remaining: 4999
],
"active": true,
"config": {
"url": "http://example.com/webhook",
"url": "https://example.com/webhook",
"content_type": "json"
},
"updated_at": "2011-09-06T20:39:23Z",
Expand Down