public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/app/directives/kibanaPanel.js
	src/app/panels/bettermap/editor.html
	src/app/panels/bettermap/module.js
	src/app/panels/hits/editor.html
	src/app/panels/map/editor.html
	src/app/panels/pie/editor.html
	src/app/panels/table/module.html
	src/app/panels/table/pagination.html
	src/app/panels/terms/editor.html
	src/app/panels/terms/module.js
	src/app/partials/dasheditor.html
	src/css/bootstrap.dark.min.css
This commit is contained in:
Torkel Ödegaard
2013-12-26 16:41:56 +01:00
parent 53f724f68e 83021709b9
commit 4aceb6086b
14 changed files with 113 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasks/build_task.js
+9 -3
View File
@@ -19,13 +19,19 @@ module.exports = function(grunt) {
grunt.registerTask('build:write_revision', function() {
grunt.event.once('git-describe', function (desc) {
grunt.config('string-replace.config', {
src: '<%= destDir %>/app/components/require.config.js',
dest: '<%= destDir %>/app/components/require.config.js',
files: {
'<%= destDir %>/app/components/require.config.js': '<%= destDir %>/app/components/require.config.js',
'<%= destDir %>/app/app.js': '<%= destDir %>/app/app.js'
},
options: {
replacements: [
{
pattern: /(?:^|\/\/)(.*)@REV@/,
replacement: '$1'+desc.object
},
{
pattern: /@REV@/,
replacement: desc.object
}
]
}
@@ -34,4 +40,4 @@ module.exports = function(grunt) {
});
grunt.task.run('git-describe');
});
}
};