diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-03-06 10:44:45 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-03-06 10:44:45 +0100 |
| commit | 9f6c589ed8c8c03d4f93bad772a91941a2f62cb3 (patch) | |
| tree | 21d7bb776c6e119dd0f5c1db35bce5cbc7c10c10 /server/sonar-web/Gruntfile.coffee | |
| parent | 1432f744dbff4834badc39fd66fe19268712a1a5 (diff) | |
| parent | 4cbfea9653a895bafb1ee7d2de521b7d78345320 (diff) | |
| download | sonarqube-9f6c589ed8c8c03d4f93bad772a91941a2f62cb3.tar.gz sonarqube-9f6c589ed8c8c03d4f93bad772a91941a2f62cb3.zip | |
Merge remote-tracking branch 'remotes/origin/feature/workspace' into branch-5.2
Conflicts:
server/sonar-web/Gruntfile.coffee
server/sonar-web/src/main/hbs/source-viewer/source-viewer-duplication-popup.hbs
server/sonar-web/src/main/less/components.less
Diffstat (limited to 'server/sonar-web/Gruntfile.coffee')
| -rw-r--r-- | server/sonar-web/Gruntfile.coffee | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index 57b0b7f30dc..f306c495a9d 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -305,6 +305,9 @@ module.exports = (grunt) -> '<%= grunt.option("assetsDir") || pkg.assets %>js/templates/widgets.js': [ '<%= pkg.sources %>hbs/widgets/**/*.hbs' ] + '<%= grunt.option("assetsDir") || pkg.assets %>js/templates/workspace.js': [ + '<%= pkg.sources %>hbs/workspace/**/*.hbs' + ] clean: |