forked from twbs/bootstrap
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/twitter/bootstrap
* 'master' of https://github.com/twitter/bootstrap: (426 commits) add affix to zip fix afffix small nits fixes twbs#4178: translate3d instead of translate ie7 button group and button toggle padding changes fix vertical button-groups in ie7 fix ie7 dropdowns examples in docs run make and add comment remove relative and top positioning from docs sidenav at narrow layout bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work reorder jumbotron links fixes twbs#4469 manually: reset width on file inputs stack mutliple progress bars bump versions to 2.1.0 updated package and readme pre font-size increase; revert static top navbar, undo contents section for now fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs copy change for previous commit fixes twbs#4460 and twbs#4461: copy change for opera animations support fixes twbs#4462: mixins instead of vanilla css ...
- Loading branch information
Showing
177 changed files
with
18,811 additions
and
33,897 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,3 +34,4 @@ nbproject | |
| .CVS | ||
| .idea | ||
| node_modules | ||
| dist | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* ========================================================== | ||
| * issue-guidelines.js | ||
| * http://twitter.github.com/bootstrap/javascript.html#alerts | ||
| * ========================================================== | ||
| * Copyright 2012 Twitter, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * ========================================================== */ | ||
|
|
||
| var assert = require('assert') | ||
|
|
||
| module.exports = { | ||
|
|
||
| 'pull-requests': { | ||
|
|
||
| 'should always be made against -wip branches': function (pull) { | ||
| assert.ok(/\-wip$/.test(pull.base.ref)) | ||
| }, | ||
|
|
||
| 'should always be made from feature branches': function (pull) { | ||
| assert.notEqual(pull.head.ref, 'master') | ||
| }, | ||
|
|
||
| 'should always include a unit test if changing js files': function (pull) { | ||
| var hasJS = false | ||
| var hasTests = false | ||
|
|
||
| pull.files.forEach(function (file) { | ||
| if (/^js\/[^./]+.js/.test(file.filename)) hasJS = true | ||
| if (/^js\/tests\/unit\/[^.]+.js/.test(file.filename)) hasTests = true | ||
| }) | ||
|
|
||
| assert.ok(!hasJS || hasJS && hasTests) | ||
| }, | ||
|
|
||
| 'after': function (pull) { | ||
| if (pull.reporter.stats.failures) { | ||
| pull.reportFailures(pull.close.bind(pull)) | ||
| } | ||
| } | ||
|
|
||
| }, | ||
|
|
||
| 'issues': { | ||
|
|
||
| 'before': function (issue) { | ||
| var plus = {} | ||
| var labels = issue.labels.map(function (label) { return label.name }); | ||
|
|
||
| if (~labels.indexOf('popular')) return | ||
|
|
||
| issue.comments.forEach(function (comment) { | ||
| if (/\+1/.test(comment.body)) plus[comment.user.login] = true | ||
| }) | ||
|
|
||
| if (Object.keys(plus).length > 5) { | ||
| issue.tag('popular') | ||
| issue.comment('Tagging this issue as popular, please stop commenting on this issue with +1. thanks!') | ||
| } | ||
| }, | ||
|
|
||
| 'should include a jsfiddle/jsbin illustrating the problem if tagged with js but not a feature': function (issue) { | ||
| var labels = issue.labels.map(function (label) { return label.name }); | ||
| if (~labels.indexOf('js') && !~labels.indexOf('feature')) assert.ok(/(jsfiddle|jsbin)/.test(issue.body)) | ||
| }, | ||
|
|
||
| 'after': function (issue) { | ||
| if (issue.reporter.stats.failures) { | ||
| issue.reportFailures(issue.close.bind(issue)) | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.