diff options
| author | Jenkins CI <ci@sonarsource.com> | 2014-10-22 12:25:56 +0200 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2014-10-22 12:25:56 +0200 |
| commit | d74a8af497dc4334907d02d891551d3e539ec9c1 (patch) | |
| tree | 8e493a74e7b62c96613539b23333a79303fd3274 /server/sonar-web/Gruntfile.coffee | |
| parent | 72045d70986657e12fa25f9ca525eb8463b4cbbd (diff) | |
| parent | ce5550c7ea0f111517559315ce33f1281012576c (diff) | |
| download | sonarqube-d74a8af497dc4334907d02d891551d3e539ec9c1.tar.gz sonarqube-d74a8af497dc4334907d02d891551d3e539ec9c1.zip | |
Automatic merge from branch-4.5
* origin/branch-4.5:
SONAR-5758 Apply CSV escaping on classic rule activation params
SONAR-5758 Use CSV escaping to send custom rule parameters
Diffstat (limited to 'server/sonar-web/Gruntfile.coffee')
| -rw-r--r-- | server/sonar-web/Gruntfile.coffee | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index 1cfbee4f784..f73abf3c7fa 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -98,6 +98,7 @@ module.exports = (grunt) -> '<%= pkg.assets %>js/common/inputs.js' '<%= pkg.assets %>js/common/dialogs.js' '<%= pkg.assets %>js/application.js' + '<%= pkg.assets %>js/csv.js' '<%= pkg.assets %>js/dashboard.js' '<%= pkg.assets %>js/duplication.js' '<%= pkg.assets %>js/resource.js' @@ -131,6 +132,7 @@ module.exports = (grunt) -> '<%= pkg.assets %>js/common/inputs.js' '<%= pkg.assets %>js/common/dialogs.js' '<%= pkg.assets %>js/application.js' + '<%= pkg.assets %>js/csv.js' '<%= pkg.assets %>js/dashboard.js' '<%= pkg.assets %>js/duplication.js' '<%= pkg.assets %>js/resource.js' |