Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'nodejs/master' into chnext
Browse files Browse the repository at this point in the history
  • Loading branch information
kunalspathak committed Jan 29, 2016
2 parents 87d88dd + 9429685 commit d720b2f
Show file tree
Hide file tree
Showing 1,412 changed files with 65,746 additions and 32,832 deletions.
16 changes: 16 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ rules:
no-unreachable: 2
## require valid typeof compared string like typeof foo === 'strnig'
valid-typeof: 2
## disallow controls characters in regular expressions
no-control-regex: 2
## disallow extra boolean casts
no-extra-boolean-cast : 2
## validate regular expressions
no-invalid-regexp: 2
## forbid weird whitespace characters
no-irregular-whitespace: 2
## avoid unexpected multiline expressions
no-unexpected-multiline: 2

# Best Practices
# list: https://github.com/eslint/eslint/tree/master/docs/rules#best-practices
Expand Down Expand Up @@ -76,6 +86,12 @@ rules:
# list: http://eslint.org/docs/rules/#ecmascript-6
## Suggest using 'const' wherever possible
prefer-const: 2
## Enforce parens around arrow function arguments
arrow-parens: [2, "always"]
## Require a space on each side of arrow operator
arrow-spacing: [2, {"before": true, "after": true}]
## Prevent using => in a condition where <= is intended
no-arrow-condition: 2

# Strict Mode
# list: https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode
Expand Down
9 changes: 6 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
## Code of Conduct

This Code of Conduct is adapted from [Rust's wonderful
CoC](http://www.rust-lang.org/conduct.html).
CoC](http://www.rust-lang.org/conduct.html) as well as the
[Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).

* We are committed to providing a friendly, safe and welcoming
environment for all, regardless of gender, sexual orientation,
disability, ethnicity, religion, or similar personal characteristic.
environment for all, regardless of level of experience, gender
identity and expression, sexual orientation, disability,
personal appearance, body size, race, ethnicity, age, religion,
nationality, or other similar characteristic.
* Please avoid using overtly sexual nicknames or other nicknames that
might detract from a friendly, safe and welcoming environment for
all.
Expand Down
17 changes: 17 additions & 0 deletions WORKING_GROUPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ back in to the TSC.
* [Post-mortem](#post-mortem)
* [Intl](#intl)
* [HTTP](#http)
* [Documentation](#documentation)

#### Process:

Expand Down Expand Up @@ -270,6 +271,22 @@ Its responsibilities are:
+ Defining and adding common structures to the dumps generated
in order to support tools that want to introspect those dumps

### [Documentation](https://github.com/nodejs/docs)

The Documentation working group exists to support the improvement of Node.js
documentation, both in the core API documentation, and elsewhere, such as the
Node.js website. Its intent is to work closely with Evangelism, Website, and
Intl working groups to make excellent documentation available and accessible
to all.

Its responsibilities are:

* Defining and maintaining documentation style and content standards.
* Producing documentation in a format acceptable for the Website WG to consume.
* Ensuring that Node's documentation addresses a wide variety of audiences.
* Creating and operating a process for documentation review that produces
quality documentation and avoids impeding the progress of Core work.

## Starting a WG

A Working Group is established by first defining a charter that can be
Expand Down
23 changes: 7 additions & 16 deletions deps/v8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*.xcodeproj
#*#
*~
.#*
.cpplint-cache
.cproject
.d8_history
Expand All @@ -42,33 +43,20 @@ shell_g
/build/gyp
/build/ipch/
/build/Release
/build/win_toolchain.json
/buildtools
/hydrogen.cfg
/obj
/out
/perf.data
/perf.data.old
/test/benchmarks/CHECKED_OUT_*
/test/benchmarks/downloaded_*
/test/benchmarks/kraken
/test/benchmarks/octane
/test/benchmarks/sunspider
/test/mozilla/CHECKED_OUT_VERSION
/test/benchmarks/data
/test/mozilla/data
/test/mozilla/data.old
/test/mozilla/downloaded_*
/test/promises-aplus/promises-tests
/test/promises-aplus/promises-tests.tar.gz
/test/promises-aplus/sinon
/test/simdjs/CHECKED_OUT_*
/test/simdjs/ecmascript_simd*
/test/simdjs/data*
/test/simdjs/data
/test/test262/data
/test/test262/data.old
/test/test262/tc39-test262-*
/test/test262-es6/data
/test/test262-es6/data.old
/test/test262-es6/tc39-test262-*
/testing/gmock
/testing/gtest
/third_party
Expand All @@ -78,6 +66,9 @@ shell_g
/tools/clang
/tools/jsfunfuzz
/tools/jsfunfuzz.zip
/tools/luci-go/linux64/isolate
/tools/luci-go/mac64/isolate
/tools/luci-go/win64/isolate.exe
/tools/oom_dump/oom_dump
/tools/oom_dump/oom_dump.o
/tools/swarming_client
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Erich Ocean <[email protected]>
Fedor Indutny <[email protected]>
Felix Geisendörfer <[email protected]>
Filipe David Manana <[email protected]>
Franziska Hinkelmann <[email protected]>
Geoffrey Garside <[email protected]>
Han Choongwoo <[email protected]>
Hirofumi Mako <[email protected]>
Expand Down Expand Up @@ -81,6 +82,7 @@ Michael Lutz <[email protected]>
Michael Smith <[email protected]>
Mike Gilbert <[email protected]>
Mike Pennisi <[email protected]>
Milton Chiang <[email protected]>
Nicolas Antonius Ernst Leopold Maria Kaiser <[email protected]>
Paolo Giarrusso <[email protected]>
Patrick Gansterer <[email protected]>
Expand Down
Loading

0 comments on commit d720b2f

Please sign in to comment.