Skip to content

The Unified and Autonomous Development Platform

Remove onedev.io references

Robin Shencbd261367106
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index ac234910db..b763170676 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -243,7 +243,7 @@ import io.onedev.server.web.util.markdown.CommitProcessor;
import io.onedev.server.web.util.markdown.IssueProcessor;
import io.onedev.server.web.util.markdown.MentionProcessor;
import io.onedev.server.web.util.markdown.PullRequestProcessor;
-import io.onedev.server.web.util.markdown.RelativeUrlProcessor;
+import io.onedev.server.web.util.markdown.UrlProcessor;
import io.onedev.server.web.websocket.CodeCommentEventBroadcaster;
import io.onedev.server.web.websocket.CommitIndexedBroadcaster;
import io.onedev.server.web.websocket.DefaultWebSocketManager;
@@ -438,7 +438,7 @@ public class CoreModule extends AbstractPluginModule {
contribute(MarkdownProcessor.class, new PullRequestProcessor());
contribute(MarkdownProcessor.class, new IssueProcessor());
contribute(MarkdownProcessor.class, new CommitProcessor());
- contribute(MarkdownProcessor.class, new RelativeUrlProcessor());
+ contribute(MarkdownProcessor.class, new UrlProcessor());
contribute(ResourcePackScopeContribution.class, new ResourcePackScopeContribution() {
diff --git a/core/src/main/java/io/onedev/server/web/OneWebApplication.java b/core/src/main/java/io/onedev/server/web/OneWebApplication.java
index 0d9d08dcc3..44b6969204 100644
--- a/core/src/main/java/io/onedev/server/web/OneWebApplication.java
+++ b/core/src/main/java/io/onedev/server/web/OneWebApplication.java
@@ -4,9 +4,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -55,20 +53,15 @@ import de.agilecoders.wicket.core.settings.BootstrapSettings;
import io.onedev.launcher.bootstrap.Bootstrap;
import io.onedev.launcher.loader.AppLoader;
import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.error.BaseErrorPage;
-import io.onedev.server.web.page.error.ExpectedExceptionPage;
-import io.onedev.server.web.page.error.UnexpectedExceptionPage;
+import io.onedev.server.web.page.error.ErrorPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.util.AbsoluteUrlRenderer;
import io.onedev.server.web.util.resourcebundle.ResourceBundleReferences;
import io.onedev.server.web.websocket.WebSocketManager;
-import io.onedev.utils.ExceptionUtils;
@Singleton
public class OneWebApplication extends WebApplication {
- private final Set<ExpectedExceptionContribution> expectedExceptionContributions;
-
@Override
public RuntimeConfigurationType getConfigurationType() {
if (Bootstrap.sandboxMode && !Bootstrap.prodMode)
@@ -224,11 +217,6 @@ public class OneWebApplication extends WebApplication {
};
}
- @Inject
- public OneWebApplication(Set<ExpectedExceptionContribution> expectedExceptionContributions) {
- this.expectedExceptionContributions = expectedExceptionContributions;
- }
-
public static OneWebApplication get() {
return (OneWebApplication) Application.get();
}
@@ -258,7 +246,7 @@ public class OneWebApplication extends WebApplication {
* user can know which page is actually causing the error. This behavior is common
* for main stream applications.
*/
- if (requestHandler.getPage() instanceof BaseErrorPage)
+ if (requestHandler.getPage() instanceof ErrorPage)
return true;
}
return super.shouldPreserveClientUrl();
@@ -272,17 +260,9 @@ public class OneWebApplication extends WebApplication {
}
protected Page mapExceptions(Exception e) {
- for (ExpectedExceptionContribution contribution: expectedExceptionContributions) {
- for (Class<? extends Exception> expectedExceptionClass: contribution.getExpectedExceptionClasses()) {
- Exception expectedException = ExceptionUtils.find(e, expectedExceptionClass);
- if (expectedException != null)
- return new ExpectedExceptionPage(expectedException);
- }
- }
-
HttpServletResponse response = (HttpServletResponse) RequestCycle.get().getResponse().getContainerResponse();
if (!response.isCommitted())
- return new UnexpectedExceptionPage(e);
+ return new ErrorPage(e);
else
return null;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 75b0543105..6d6ee0d16a 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -429,8 +429,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {
public void insertUrl(AjaxRequestTarget target, boolean isImage, String url,
String name, @Nullable String replaceMessage) {
- if (isImage && getBlobRenderContext() != null)
- url = getBlobRenderContext().appendRaw(url);
String script = String.format("onedev.server.markdown.insertUrl('%s', %s, '%s', '%s', %s);",
container.getMarkupId(), isImage, StringEscapeUtils.escapeEcmaScript(url),
StringEscapeUtils.escapeEcmaScript(name),
diff --git a/core/src/main/java/io/onedev/server/web/page/error/BaseErrorPage.java b/core/src/main/java/io/onedev/server/web/page/error/BaseErrorPage.java
deleted file mode 100644
index 8449f5229e..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/error/BaseErrorPage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.onedev.server.web.page.error;
-
-import java.io.Serializable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.web.page.base.BasePage;
-
-@SuppressWarnings("serial")
-public abstract class BaseErrorPage extends BasePage {
-
- public BaseErrorPage(PageParameters params) {
- super(params);
- }
-
- @Override
- public boolean isErrorPage() {
- return true;
- }
-
- @Override
- protected void onPopState(AjaxRequestTarget target, Serializable data) {
- super.onPopState(target, data);
- target.appendJavaScript("location.reload();");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ErrorPageResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("$('html,body').addClass('error');"));
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html b/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html
rename to core/src/main/java/io/onedev/server/web/page/error/ErrorPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java b/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java
similarity index 51%
rename from core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java
rename to core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java
index a8849fc33b..ea4769be98 100644
--- a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java
@@ -1,8 +1,13 @@
package io.onedev.server.web.page.error;
+import java.io.Serializable;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -10,20 +15,31 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Throwables;
+import io.onedev.server.OneDev;
+import io.onedev.server.web.ExpectedExceptionContribution;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectListPage;
@SuppressWarnings("serial")
-public class ExpectedExceptionPage extends BaseErrorPage {
+public class ErrorPage extends BasePage {
- private final String title;
+ private String title;
- private final String detailMessage;
+ private String detailMessage;
- public ExpectedExceptionPage(Exception exception) {
+ public ErrorPage(Exception exception) {
super(new PageParameters());
- title = exception.getMessage();
+
+ for (ExpectedExceptionContribution contribution: OneDev.getExtensions(ExpectedExceptionContribution.class)) {
+ if (contribution.getExpectedExceptionClasses().contains(exception.getClass())) {
+ title = exception.getMessage();
+ break;
+ }
+ }
+ if (title == null)
+ title = "An unexpected exception occurred";
detailMessage = Throwables.getStackTraceAsString(exception);
}
@@ -43,7 +59,7 @@ public class ExpectedExceptionPage extends BaseErrorPage {
@Override
public void onClick(AjaxRequestTarget target) {
- Fragment fragment = new Fragment("detail", "detailFrag", ExpectedExceptionPage.this);
+ Fragment fragment = new Fragment("detail", "detailFrag", ErrorPage.this);
fragment.add(new MultilineLabel("body", detailMessage));
container.replace(fragment);
target.add(container);
@@ -54,4 +70,22 @@ public class ExpectedExceptionPage extends BaseErrorPage {
container.add(new WebMarkupContainer("detail"));
}
+ @Override
+ public boolean isErrorPage() {
+ return true;
+ }
+
+ @Override
+ protected void onPopState(AjaxRequestTarget target, Serializable data) {
+ super.onPopState(target, data);
+ target.appendJavaScript("location.reload();");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new ErrorPageResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("$('html,body').addClass('error');"));
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.html b/core/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.html
deleted file mode 100644
index 225f11b72b..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<wicket:extend>
- <script type="text/javascript">
- function validateBugReport() {
- var noError = true;
- var value = document.getElementById("subject").value.toString();
- if (value == null || value.trim().length == 0) {
- $("#subject_error").show();
- noError = false;
- } else {
- $("#subject_error").hide();
- }
- value = document.getElementById("description").value.toString();
- if (value == null || value.trim().length == 0) {
- $("#description_error").show();
- noError = false;
- } else {
- $("#description_error").hide();
- }
- value = document.getElementById("contact_name").value.toString();
- if (value == null || value.trim().length == 0) {
- $("#contact_name_error").show();
- noError = false;
- } else {
- $("#contact_name_error").hide();
- }
- value = document.getElementById("contact_email").value.toString();
- if (value == null || value.trim().length == 0) {
- $("#contact_email_error").show();
- noError = false;
- } else {
- $("#contact_email_error").hide();
- }
-
- if (!noError) {
- $(".has-errors").show();
- $(".submitting").hide();
- } else {
- $(".has-errors").hide();
- $(".submitting").show();
- }
- return noError;
- };
- </script>
- <div class="wide center-box">
- <div class="title">Whoops! An Unexpected Exception Occurred</div>
-
- <div class="description">Sorry, we've encountered an unexpected
- exception. If you believe it is a bug of OneDev, please send this
- error using below form to help us improving quality of the product</div>
-
- <form action="https://www.onedev.io/bug-report" method="post">
- <div class="actions">
- <input type="submit" value="Send Error Report" class="btn btn-primary" onclick="if (validateBugReport()) this.form.submit();return false;"></input>
- <input wicket:id="homeTop" type="button" value="Back to Home" class="btn btn-primary"></input>
- </div>
- <h4 class="alert alert-danger has-errors">Fix errors below</h4>
- <h4 class="alert alert-info submitting">Submitting bug report...</h4>
- <table class="table properties">
- <tbody>
- <tr>
- <td class="name">Subject <span class="required">*</span></td>
- <td class="value">
- <input type="text" id="subject" name="subject" value="Unexpected exception" class="form-control"></input>
- <div id="subject_error" class="error"><i class="fa fa-warning"></i> Subject can not be empty</div>
- <div class="help-block">Specify title of the bug report</div>
- </td>
- </tr>
- <tr>
- <td class="name">Description <span class="required">*</span></td>
- <td class="value">
- <textarea wicket:id="description" id="description" name="description" class="form-control no-autosize"></textarea>
- <div id="description_error" class="error"><i class="fa fa-warning"></i> Description can not be empty</div>
- <div class="help-block">Please describe details for the
- error below. It is filled with error message of the exception by
- default. You may add more details here, for example, to describe
- steps to reproduce the error</div>
- </td>
- </tr>
- <tr>
- <td class="name">Contact Email <span class="required">*</span></td>
- <td class="value">
- <input wicket:id="contactEmail" id="contact_email" type="text" name="contact_email" class="form-control">
- <div id="contact_email_error" class="error"><i class="fa fa-warning"></i> Contact email can not be empty</div>
- <div class="help-block">Please provide an email so that we can contact with to get details of the
- error if necessary</div>
- </td>
- </tr>
- <tr>
- <td class="name">Contact Name <span class="required">*</span></td>
- <td class="value">
- <input wicket:id="contactName" id="contact_name" type="text" name="contact_name" class="form-control">
- <div id="contact_name_error" class="error"><i class="fa fa-warning"></i> Contact name can not be empty</div>
- <div class="help-block">Please provide name of the contact above</div></td>
- </tr>
- <tr>
- <td colspan="2" class="caption">Below information will also be sent to help us analyzing the problem</td>
- </tr>
- <tr wicket:id="props">
- <td wicket:id="name"></td>
- <td wicket:id="value"></td>
- </tr>
- </tbody>
- </table>
- <div class="actions">
- <input type="submit" value="Send Error Report" onclick="if (validateBugReport()) this.form.submit();return false;" class="btn btn-primary"></input>
- <input wicket:id="homeBottom" type="button" value="Back to Home" class="btn btn-primary"></input>
- </div>
- <input wicket:id="backUrl" type="hidden" name="back_url"></input>
- <input wicket:id="additionalInfo" type="hidden" name="additional_info"></input>
- </form>
- </div>
-</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java b/core/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java
deleted file mode 100644
index 9545418d92..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.onedev.server.web.page.error;
-
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.base.Throwables;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.SettingManager;
-import io.onedev.server.model.User;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
-
-@SuppressWarnings("serial")
-public class UnexpectedExceptionPage extends BaseErrorPage {
-
- private static final long serialVersionUID = 1L;
-
- private final String description;
-
- public UnexpectedExceptionPage(Exception exception) {
- super(new PageParameters());
- description = "Error Details: \n\n" + StringUtils.replace(Throwables.getStackTraceAsString(exception).trim(), " ", "\t");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new TextArea<String>("description", Model.of(description)));
- add(new WebMarkupContainer("contactName") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- User user = getLoginUser();
- if (user != null)
- tag.put("value", user.getDisplayName());
- }
-
- });
- add(new WebMarkupContainer("contactEmail") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- User user = getLoginUser();
- if (user != null)
- tag.put("value", user.getEmail());
- }
-
- });
-
- List<Property> serverProps = new ArrayList<>();
- try {
- serverProps.add(new Property("Host Name", InetAddress.getLocalHost().getHostName()));
- } catch (UnknownHostException e) {
- throw new RuntimeException(e);
- }
- serverProps.add(new Property("System Date and Time", DateUtils.formatDateTime(new Date())));
- serverProps.add(new Property("Operating System",
- System.getProperty("os.name") + " "
- + System.getProperty("os.version") + ", "
- + System.getProperty("os.arch")));
- serverProps.add(new Property("OS User",
- System.getProperty("user.name")));
- serverProps.add(new Property("JVM",
- System.getProperty("java.vm.name") + " "
- + System.getProperty("java.version") + ", "
- + System.getProperty("java.vm.vendor")));
- serverProps.add(new Property("OneDev Version", "EAP"));
- User user = getLoginUser();
- if (user != null)
- serverProps.add(new Property("OneDev User", user.getName()));
- else
- serverProps.add(new Property("OneDev User", "<anonymous>"));
- serverProps.add(new Property("Total Memory",
- FileUtils.byteCountToDisplaySize(Runtime.getRuntime().maxMemory())));
- serverProps.add(new Property("Used Memory",
- FileUtils.byteCountToDisplaySize(Runtime.getRuntime().totalMemory() -
- Runtime.getRuntime().freeMemory())));
- add(new ListView<Property>("props", serverProps) {
-
- @Override
- protected void populateItem(ListItem<Property> item) {
- Property property = item.getModelObject();
- item.add(new Label("name", property.getName()));
- item.add(new Label("value", property.getValue()));
- }
-
- });
- add(new BookmarkablePageLink<Void>("homeTop", ProjectListPage.class));
- add(new BookmarkablePageLink<Void>("homeBottom", ProjectListPage.class));
-
- add(new WebMarkupContainer("backUrl") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("value", OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl());
- }
-
- });
- add(new WebMarkupContainer("additionalInfo") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- String serverInfo = "";
- for (Property property: serverProps)
- serverInfo += property.getName() + ": " + property.getValue() + "\n";
- tag.put("value", serverInfo);
- }
-
- });
- }
-
- private static class Property implements Serializable {
-
- private final String name;
-
- private final String value;
-
- public Property(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- public String getName() {
- return name;
- }
-
- public String getValue() {
- return value;
- }
-
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/error/error-page.css b/core/src/main/java/io/onedev/server/web/page/error/error-page.css
index 75f240b81e..d55b885e28 100644
--- a/core/src/main/java/io/onedev/server/web/page/error/error-page.css
+++ b/core/src/main/java/io/onedev/server/web/page/error/error-page.css
@@ -26,30 +26,3 @@ body.error .center-box .detail>.body {
word-wrap: break-word;
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
-
-body.error .center-box textarea {
- height: 600px;
-}
-
-body.error .has-errors, body.error .submitting {
- display: none;
-}
-
-body.error form .actions {
- margin-bottom: 20px;
-}
-body.error td.name {
- font-weight: bold;
- color: #444;
- width: 140px;
-}
-body.error form .error {
- margin-top: 8px;
- color: #A00;
- display: none;
-}
-
-body.error .caption {
- font-size: 16px;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index a50be05b7d..ba19ab08cf 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -9,7 +9,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://onedev.io">
+ <a class="navbar-brand" href="https://github.com/theonedev/onedev">
<img alt="Brand" src="/img/logo.png">
<div class="separator"></div>
</a>
@@ -45,7 +45,7 @@
<li wicket:id="productVersion" class="dropdown-header"></li>
<li role="separator" class="divider"></li>
<li><a wicket:id="docLink">Documentation</a></li>
- <li><a href="mailto:[email protected]">Support &amp; Bug Report</a></li>
+ <li><a href="https://github.com/theonedev/onedev/issues">Support &amp; Bug Report</a></li>
</ul>
</li>
<wicket:container wicket:id="notSignedIn">
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java
rename to core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java
index bda9491454..967f99a89b 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java
@@ -28,7 +28,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.utils.PathUtils;
import io.onedev.utils.UrlUtils;
-public class RelativeUrlProcessor implements MarkdownProcessor {
+public class UrlProcessor implements MarkdownProcessor {
@Override
public void process(Project project, Document rendered, Object context) {
@@ -93,7 +93,7 @@ public class RelativeUrlProcessor implements MarkdownProcessor {
url = url.trim();
if (UrlUtils.isRelative(url) && !url.startsWith("#")) {
Element element = (Element) node;
- element.attr("src", resolveUrl(blobRenderContext.getDirectoryUrl(), url));
+ element.attr("src", blobRenderContext.appendRaw(resolveUrl(blobRenderContext.getDirectoryUrl(), url)));
try {
String basePath = blobRenderContext.getDirectory();
String referencedPath = PathUtils.resolve(basePath, UrlUtils.trimHashAndQuery(URLDecoder.decode(url, Charsets.UTF_8.name())));