Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
e52920ca
Commit
e52920ca
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
no more concurrency
parent
8ee6a6be
4 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Gruntfile.js
+7
-7
Gruntfile.js
with
7 additions
and
7 deletions
+7
-7
Gruntfile.js
+
7
-
7
View file @
e52920ca
...
...
@@ -20,7 +20,7 @@ module.exports = function (grunt) {
var
generateGlyphiconsData
=
require
(
'
./grunt/bs-glyphicons-data-generator.js
'
);
var
BsLessdocParser
=
require
(
'
./grunt/bs-lessdoc-parser.js
'
);
var
generateRawFiles
=
require
(
'
./grunt/bs-raw-files-generator.js
'
);
var
updateShrinkwrap
=
require
(
'
./grunt/shrinkwrap.js
'
);
//
var updateShrinkwrap = require('./grunt/shrinkwrap.js');
// Project configuration.
grunt
.
initConfig
({
...
...
@@ -388,9 +388,9 @@ module.exports = function (grunt) {
npmUpdate
:
{
command
:
'
npm update
'
},
npmShrinkWrap
:
{
command
:
'
npm shrinkwrap --dev
'
}
//
npmShrinkWrap: {
//
command: 'npm shrinkwrap --dev'
//
}
}
});
...
...
@@ -435,7 +435,7 @@ module.exports = function (grunt) {
grunt
.
registerTask
(
'
dist
'
,
[
'
clean
'
,
'
dist-css
'
,
'
copy:fonts
'
,
'
dist-js
'
,
'
dist-docs
'
]);
// Default task.
grunt
.
registerTask
(
'
default
'
,
[
'
test
'
,
'
dist
'
,
'
build-glyphicons-data
'
,
'
build-customizer
'
,
'
update-shrinkwrap
'
]);
grunt
.
registerTask
(
'
default
'
,
[
'
test
'
,
'
dist
'
,
'
build-glyphicons-data
'
,
'
build-customizer
'
]);
// Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
...
...
@@ -453,6 +453,6 @@ module.exports = function (grunt) {
});
// Task for updating the npm packages used by the Travis build.
grunt
.
registerTask
(
'
update-shrinkwrap
'
,
[
'
exec:npmUpdate
'
,
'
exec:npmShrinkWrap
'
,
'
_update-shrinkwrap
'
]);
grunt
.
registerTask
(
'
_update-shrinkwrap
'
,
function
()
{
updateShrinkwrap
.
call
(
this
,
grunt
);
});
//
grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', 'exec:npmShrinkWrap', '_update-shrinkwrap']);
//
grunt.registerTask('_update-shrinkwrap', function () { updateShrinkwrap.call(this, grunt); });
};
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets