8000 Merge remote-tracking branch 'refs/remotes/vuejs/dev' into dev · noscripter/vue@ebfac85 · GitHub
[go: up one dir, main page]
Skip to content

Commit ebfac85

Browse files
vprimachenkovprimachenko
committed
Merge remote-tracking branch 'refs/remotes/vuejs/dev' into dev
2 parents deb43a8 + 6726a91 commit ebfac85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1298
-857
lines changed

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Hi! I’m really excited that you are interested in contributing to Vue.js. Befo
44

55
## Issue Reporting Guidelines
66

7-
- The issue list of this repo is **exclusively** for bug reports and feature requests. For simple questions, please use either [Gitter](https://gitter.im/yyx990803/vue) or [the official forum](http://forum.vuejs.org/).
7+
- The issue list of this repo is **exclusively** for bug reports and feature requests. For simple questions, please use either [Gitter](https://gitter.im/vuejs/vue) or [the official forum](http://forum.vuejs.org/).
88

99
- Try to search for your issue, it may have already been answered or even fixed in the development branch.
1010

@@ -94,4 +94,4 @@ The default task (by simply running `grunt`) will do the following: lint -> buil
9494

9595
The unit tests are written with Jasmine and run with Karma. The e2e tests are written for and run with CasperJS.
9696

97-
Note that the unit tests will automatically be run in Chrome, Firefox and Safari. If you are not on a Mac, or don't have one of the browsers installed on your system, you can modify the [karma config in gruntfile.js](https://github.com/yyx990803/vue/blob/dev/gruntfile.js#L38) to only run Karma tests in browsers that are available on your system. Just make sure don’t check in the gruntfile changes for the commit.
97+
Note that the unit tests will automatically be run in Chrome, Firefox and Safari. If you are not on a Mac, or don't have one of the browsers installed on your system, you can modify the [karma config in gruntfile.js](https://github.com/vuejs/vue/blob/dev/gruntfile.js#L38) to only run Karma tests in browsers that are available on your system. Just make F438 sure don’t check in the gruntfile changes for the commit.

‎README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<p align="center"><a href="http://vuejs.org" target="_blank"><img width="100"src="http://vuejs.org/images/logo.png"></a></p>
22

33
<p align="center">
4-
<a href="https://circleci.com/gh/yyx990803/vue/tree/master"><img src="https://circleci.com/gh/yyx990803/vue/tree/master.svg?style=shield" alt="Build Status"></a>
5-
<a href="https://codecov.io/github/yyx990803/vue?branch=master"><img src="https://codecov.io/github/yyx990803/vue/coverage.svg?branch=dev" alt="Coverage Status"></a>
6-
<a href="https://www.bithound.io/github/yyx990803/vue"><img src="https://www.bithound.io/github/yyx990803/vue/badges/score.svg" alt="bitHound Score"></a>
4+
<a href="https://circleci.com/gh/vuejs/vue/tree/master"><img src="https://circleci.com/gh/vuejs/vue/tree/master.svg?style=shield" alt="Build Status"></a>
5+
<a href="https://codecov.io/github/vuejs/vue?branch=master"><img src="https://codecov.io/github/vuejs/vue/coverage.svg?branch=dev" alt="Coverage Status"></a>
6+
<a href="https://www.bithound.io/github/vuejs/vue"><img src="https://www.bithound.io/github/vuejs/vue/badges/score.svg" alt="bitHound Score"></a>
77
<br>
8-
<a href="http://issuestats.com/github/yyx990803/vue"><img src="http://issuestats.com/github/yyx990803/vue/badge/issue?style=flat"></a>
9-
<a href="https://gitter.im/yyx990803/vue"><img src="https://badges.gitter.im/Join Chat.svg"></a>
8+
<a href="http://issuestats.com/github/vuejs/vue"><img src="http://issuestats.com/github/vuejs/vue/badge/issue?style=flat"></a>
9+
<a href="https://gitter.im/vuejs/vue"><img src="https://badges.gitter.im/Join Chat.svg"></a>
1010
</p>
1111

1212
## Intro
@@ -17,25 +17,25 @@ Vue.js is a library for building interactive web interfaces. It provides data-re
1717
- Component-oriented development style with tooling support
1818
- Lean and extensible core
1919
- Flexible transition effect system
20-
- [Fast](http://vuejs.github.io/js-repaint-perfs/vue/)!
20+
- Fast without the need for complex optimization
2121

2222
Note that Vue.js only supports [ES5-compliant browsers](http://kangax.github.io/compat-table/es5/) (IE8 and below are not supported). To check out live examples and docs, visit [vuejs.org](http://vuejs.org). You can also start with this excellent screencast series on [Laracasts](https://laracasts.com/series/learning-vuejs).
2323

2424
## Questions
2525

26-
For questions and support please use the [Gitter chat room](https://gitter.im/yyx990803/vue) or [the official forum](http://forum.vuejs.org). The issue list of this repo is **exclusively** for bug reports and feature requests.
26+
For questions and support please use the [Gitter chat room](https://gitter.im/vuejs/vue) or [the official forum](http://forum.vuejs.org). The issue list of this repo is **exclusively** for bug reports and feature requests.
2727

2828
## Issues
2929

30-
Please make sure to read the [Issue Reporting Checklist](https://github.com/yyx990803/vue/blob/dev/CONTRIBUTING.md#issue-reporting-guidelines) before opening an issue. Issues not conforming to the guidelines may be closed immediately.
30+
Please make sure to read the [Issue Reporting Checklist](https://github.com/vuejs/vue/blob/dev/CONTRIBUTING.md#issue-reporting-guidelines) before opening an issue. Issues not conforming to the guidelines may be closed immediately.
3131

3232
## Contribution
3333

34-
Please make sure to read the [Contributing Guide](https://github.com/yyx990803/vue/blob/dev/CONTRIBUTING.md) before making a pull request. If you have a Vue-related project/component/tool, add it to [this list](https://github.com/yyx990803/vue/wiki/User-Contributed-Components-&-Tools)!
34+
Please make sure to read the [Contributing Guide](https://github.com/vuejs/vue/blob/dev/CONTRIBUTING.md) before making a pull request. If you have a Vue-related project/component/tool, add it to [this list](https://github.com/vuejs/vue/wiki/User-Contributed-Components-&-Tools)!
3535

3636
## Changelog
3737

38-
Details changes for each release are documented in the [release notes](https://github.com/yyx990803/vue/releases).
38+
Details changes for each release are documented in the [release notes](https://github.com/vuejs/vue/releases).
3939

4040
## Stay In Touch
4141

‎build/grunt-tasks/release.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ module.exports = function (grunt) {
5656
var next = semver.inc(current, version || 'patch') || version
5757

5858
if (!semver.valid(next)) {
59-
return grunt.fail.warn('Invalid version.')
59+
grunt.fail.warn('Invalid version.')
6060
}
6161
if (semver.lt(next, current)) {
62-
return grunt.fail.warn('Version is older than current.')
62+
grunt.fail.warn('Version is older than current.')
6363
}
6464

6565
readline.createInterface({

0 commit comments

Comments
 (0)
0