]> source.dussan.org Git - sonarqube.git/commit
Fix merge of branch feature/ce-monitoring
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Fri, 18 Sep 2015 22:08:53 +0000 (00:08 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Sat, 19 Sep 2015 06:56:41 +0000 (08:56 +0200)
commit1930d3927a57af7007c46605ae2a99357218b4ed
treee67c9ca4479c6c5065e8edbad6c193acd36f84f2
parent1ce6cafa3757ce187cf66bc24b780680452808c1
Fix merge of branch feature/ce-monitoring

- JS changes (ES2015)
- DB migration conflicts
server/sonar-web/src/main/js/apps/computation/report.js
server/sonar-web/src/main/js/apps/computation/reports.js
server/sonar-web/src/main/js/apps/computation/router.js
server/sonar-web/src/main/webapp/WEB-INF/db/migrate/931_increase_precision_of_numerics.rb [deleted file]
server/sonar-web/src/main/webapp/WEB-INF/db/migrate/937_increase_precision_of_numerics.rb [new file with mode: 0644]
server/sonar-web/src/test/js/computation-spec.js
sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java