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

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

author	Grégoire Aubert <gregoire.aubert@sonarsource.com>
	Mon, 24 Jul 2017 07:13:46 +0000 (09:13 +0200)
committer	Grégoire Aubert <gregoire.aubert@sonarsource.com>
	Mon, 24 Jul 2017 07:13:46 +0000 (09:13 +0200)
commit	fcd747a0cbaf7e76c71e840ae207e7b0355a6a68
tree	99f6ea7243a6b018ac2b5b2558ee9253004f0430	tree \| snapshot
parent	544c4c57a45afbea604cf0cf02eeb268f59565e6	commit \| diff

Fix merge conflict with branch-6.5

24 files changed:

server/sonar-web/src/main/js/apps/overview/components/LeakPeriodLegend.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/Analysis.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/Event.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/PreviewGraph.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/__tests__/PreviewGraphTooltips-test.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/Analysis-test.js.snap		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/events/__tests__/__snapshots__/Event-test.js.snap		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/main/enhance.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/meta/Meta.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/overview/meta/MetaQualityProfiles.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectActivity/__tests__/__snapshots__/utils-test.js.snap		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAppContainer.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysesList-test.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityApp-test.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/projects-admin/search.js		diff \| blob \| history
server/sonar-web/src/main/js/apps/projects-admin/views/BulkApplyTemplateView.js		diff \| blob \| history
server/sonar-web/src/main/js/helpers/storage.js		diff \| blob \| history
sonar-core/src/main/resources/org/sonar/l10n/core.properties		diff \| blob \| history
tests/src/test/java/org/sonarqube/pageobjects/ProjectsManagementPage.java		diff \| blob \| history
tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectAdministrationTest.java		diff \| blob \| history

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

RSS Atom