source.dussan.org Git - sonarqube.git/commit

]> source.dussan.org Git - sonarqube.git/commit

author	Jacek <jacek.poreda@sonarsource.com>
	Fri, 6 Sep 2019 08:19:26 +0000 (10:19 +0200)
committer	SonarTech <sonartech@sonarsource.com>
	Tue, 24 Sep 2019 18:21:17 +0000 (20:21 +0200)
commit	e8f1a84869bcb72af1ca30fa78b9c936a3e028a3
tree	c525ec29534c2266bd7cc76cfab344cfa6e1c3ae	tree \| snapshot
parent	3079907d1f13a509709c72a5dade87d129a4eb5c	commit \| diff

Fix conflicts after rebase

21 files changed:

server/sonar-db-dao/src/test/java/org/sonar/db/newcodeperiod/NewCodePeriodDbTester.java	[deleted file]	blob \| history
server/sonar-db-dao/src/testFixtures/java/org/sonar/db/newcodeperiod/NewCodePeriodDbTester.java	[new file with mode: 0644]	blob
server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/__tests__/App-test.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/__tests__/ProjectBaselineSelector-test.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/__tests__/__snapshots__/BranchList-test.tsx.snap		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/__tests__/__snapshots__/ProjectBaselineSelector-test.tsx.snap		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/__tests__/utils-test.ts		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/styles.css		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectBaseline/utils.ts		diff \| blob \| history
server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx		diff \| blob \| history
server/sonar-web/src/main/js/helpers/__tests__/periods-test.ts		diff \| blob \| history
server/sonar-web/src/main/js/helpers/periods.ts		diff \| blob \| history
sonar-core/src/main/resources/org/sonar/l10n/core.properties		diff \| blob \| history

Continuous Inspection: https://github.com/SonarSource/sonarqube

RSS Atom