You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/11/10 16:47:22 UTC
ambari git commit: Revert "Merge branch 'trunk' of
D:\incubator-ambari with conflicts."
Repository: ambari
Updated Branches:
refs/heads/trunk b17637c9b -> de1f8ff64
Revert "Merge branch 'trunk' of D:\incubator-ambari with conflicts."
This reverts commit e2fc2da45e6b392502dee2955096371cf21c3398.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/de1f8ff6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de1f8ff6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de1f8ff6
Branch: refs/heads/trunk
Commit: de1f8ff64d138e647148bb8b660cec5e9a081a02
Parents: b17637c
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Nov 10 17:44:05 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Nov 10 17:44:05 2014 +0200
----------------------------------------------------------------------
ambari-web/karma.conf.js | 4 +--
.../jobs/src/main/resources/ui/Gruntfile.js | 36 +++++++-------------
2 files changed, 14 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/de1f8ff6/ambari-web/karma.conf.js
----------------------------------------------------------------------
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index d5351a6..3a54978 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -102,7 +102,7 @@ module.exports = function(config) {
},
preprocessors: {
- '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
+// '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
'app/templates/**/*.hbs': ['ember-precompiler-brunch', 'common-require'],
'app!(assets)/**/!(karma_setup|tests).js': ['common-require'],
'test/**/*.js': ['common-require']
@@ -117,7 +117,7 @@ module.exports = function(config) {
// test results reporter to use
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
// reporters: ['progress', 'coverage'],
- reporters: ['progress', 'coverage'],
+ reporters: ['progress'],
// web server port
http://git-wip-us.apache.org/repos/asf/ambari/blob/de1f8ff6/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
index ba69c24..f5c13e6 100644
--- a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
+++ b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
@@ -181,18 +181,6 @@ module.exports = function (grunt) {
dirs: ['<%= yeoman.dist %>']
}
},
- imagemin: {
- dist: {
- files: [
- {
- expand: true,
- cwd: '<%= yeoman.app %>/images',
- src: '{,*/}*.{png,jpg,jpeg}',
- dest: '<%= yeoman.dist %>/images'
- }
- ]
- }
- },
svgmin: {
dist: {
files: [
@@ -272,22 +260,24 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>',
src: [
- '*.{ico,txt,php}',
+ '*.{ico,txt}',
'.htaccess',
'img/*',
'styles/fonts/*',
'scripts/assets/**/*'
]
- }
- ]
- },
- xampp: {
- files: [
+ },
+ {
+ expand: true,
+ flatten: true,
+ src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*',
+ dest: '<%= yeoman.dist %>/styles/images/'
+ },
{
expand: true,
- flatten: false,
- src: '<%= yeoman.dist %>/**/*',
- dest: 'D:/xampp/htdocs/'
+ flatten: true,
+ src: '<%= yeoman.app %>/bower_components/font-awesome/font/*',
+ dest: '<%= yeoman.dist %>/font/'
}
]
}
@@ -301,7 +291,6 @@ module.exports = function (grunt) {
],
dist: [
'emberTemplates',
- 'imagemin',
'svgmin',
'htmlmin'
]
@@ -396,8 +385,7 @@ module.exports = function (grunt) {
//'uglify',
'copy:dist',
//'rev',
- 'usemin',
- 'copy:xampp'
+ 'usemin'
]);
grunt.registerTask('default', [