From: ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Date: Wed, 20 Dec 2017 07:01:13 +0000 (+0100)
Subject: Automatic merge from branch-6.7
X-Git-Tag: 7.0-RC1~98
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21df896e6a95216e8a468e852ba7d738943a3182;p=sonarqube.git

Automatic merge from branch-6.7

* origin/branch-6.7:
  SONAR-10177 Dont rely on router Link in the source code viewer header
---

21df896e6a95216e8a468e852ba7d738943a3182
diff --cc server/sonar-web/src/main/js/helpers/urls.ts
index 5de3cb928fb,e73d9d2d67d..a23974850b2
--- a/server/sonar-web/src/main/js/helpers/urls.ts
+++ b/server/sonar-web/src/main/js/helpers/urls.ts
@@@ -76,14 -72,9 +72,9 @@@ export function getIssuesUrl(query: Que
   * Generate URL for a component's issues page
   */
  export function getComponentIssuesUrl(componentKey: string, query?: Query): Location {
 -  return { pathname: '/project/issues', query: { ...query || {}, id: componentKey } };
 +  return { pathname: '/project/issues', query: { ...(query || {}), id: componentKey } };
  }
  
- export function getComponentIssuesUrlAsString(componentKey: string, query?: Query): string {
-   const path = getComponentIssuesUrl(componentKey, query);
-   return `${getBaseUrl()}${path.pathname}?${stringify(path.query)}`;
- }
- 
  /**
   * Generate URL for a component's drilldown page
   */