Skip to content

Commit 6d61096

Browse files
authored
Merge branch 'master' into opencollective
2 parents ddefa70 + fecbb2d commit 6d61096

File tree

146 files changed

+15531
-7153
lines changed

Some content is hidden

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

146 files changed

+15531
-7153
lines changed

.babelrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
],
55
"presets": [
66
"es2015",
7-
"stage-0"
7+
"stage-3",
8+
["env", {
9+
"targets": {
10+
"node": "4.6"
11+
}
12+
}]
813
]
914
}

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"space-in-parens": ["error", "never"],
2222
"no-multiple-empty-lines": 1,
2323
"prefer-const": "error",
24-
"space-infix-ops": "error"
24+
"space-infix-ops": "error",
25+
"no-useless-escape": "off"
2526
}
2627
}

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ If you have a non-bug question, ask on Stack Overflow or Server Fault:
44
- https://stackoverflow.com/questions/tagged/parse.com
55
- https://serverfault.com/tags/parse
66

7-
You may also search through existing issues before opening a new one: https://github.com/ParsePlatform/Parse-Server/issues?utf8=%E2%9C%93&q=is%3Aissue
7+
You may also search through existing issues before opening a new one: https://github.com/parse-community/parse-server/issues?utf8=%E2%9C%93&q=is%3Aissue
88

99
--- Please use this template. If you don't use this template, your issue may be closed without comment. ---
1010

.travis.yml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,14 @@
11
language: node_js
22
dist: trusty
3-
node_js:
4-
- '4.6'
5-
- '6.1'
63
services:
4+
- mongodb
75
- postgresql
86
- redis-server
97
- docker
108
addons:
119
postgresql: '9.5'
1210
apt_packages:
1311
- postgresql-9.5-postgis-2.3
14-
before_script:
15-
- node -e 'require("./lib/index.js")'
16-
- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
17-
- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
18-
- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
19-
env:
20-
global:
21-
- COVERAGE_OPTION='./node_modules/.bin/nyc'
22-
matrix:
23-
- MONGODB_VERSION=3.0.8
24-
- MONGODB_VERSION=3.2.6
25-
- PARSE_SERVER_TEST_DB=postgres
26-
- PARSE_SERVER_TEST_CACHE=redis
27-
matrix:
28-
fast_finish: true
2912
branches:
3013
only:
3114
- master
@@ -35,36 +18,53 @@ cache:
3518
directories:
3619
- node_modules
3720
- "$HOME/.mongodb/versions"
21+
22+
# Test stage
23+
stage: test
24+
env:
25+
global:
26+
- COVERAGE_OPTION='./node_modules/.bin/nyc'
27+
- NODE_VERSION=6.10
28+
matrix:
29+
- MONGODB_VERSION=3.2.13
30+
- MONGODB_VERSION=3.4.4
31+
- PARSE_SERVER_TEST_DB=postgres
32+
- PARSE_SERVER_TEST_CACHE=redis
33+
- NODE_VERSION=8.5
34+
before_install:
35+
- nvm install $NODE_VERSION
36+
- nvm use $NODE_VERSION
37+
before_script:
38+
- node -e 'require("./lib/index.js")'
39+
- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
40+
- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
41+
- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
42+
- silent=1 mongodb-runner --start
3843
after_script:
3944
- bash <(curl -s https://codecov.io/bash)
40-
after_failure:
41-
- (cd resources; python travis_after_all.py)
42-
after_success:
43-
- (cd resources; python travis_after_all.py)
44-
- export $(cat resources/.to_export_back)
4545

46-
deploy:
47-
- provider: npm
48-
skip_cleanup: true
49-
email:
50-
secure: "YweTGc22uqFWpzbfiUa5ptBLRAy6tt6d9TZLwEkPtmnsWzN9dguGyKWmXiw0qL+848FWQ5PWzUgBn5XdigV9tF3rJY6RGs8i38WulNjwSoGuRZa3AChsQHAb1KenANcJybzhnwgEj9gRsrGZPEsyI2whfake/xLDtG91kHjpJANsd4gseOh6fdS4FIYCbyXvSbC7S0yZzIJkgSkMqJO7RJ8r0HYQ7srYIw31dM3ZXSmUYu+GaMDUUu3RLAGYoKaROxhDRnzkjdeLLiwZH8hQ/6CaqwqX54iJ6OS+MOQU3fi5ZXalA7RZvtC4RmrcCkaTf3i0f+5xejYIFgzXdYGMVm8DUc82tDw1s4b6Pb19bgi1xXOQ0IKzRmZuGxnvkRN61dnYdnpnnNuG97HXgVjiOigZXVLZkWazUdnf9zXqmkC+KxPfa4Ldqg0TMjQ9J14n6TXxRti8Tt0xMa1Uzho7VdsxdJy35Bghy398O6X8VdX6parfzEkX7c/JzcA3TIMJ9+S1dy3J4Tb2URB5367W6h7cDeXtGmwLTFu75Q1CNqRJkUGbSrX2NyMqG5tc8oaTM+OWvLxcbKPRy9T6qN7x2JmCHHaapf8/8VR9wCy2PwE5j+KWhmctEHqqOgrtG5gsjC0eCPJsposxZWyM7M6aUpXe3w+olBfKq9apUGStUSU="
51-
api_key:
52-
secure: "QprkaqQ+WCvZQR4qIEs5iS6peMCbRd8Hgt0s6HfdmhavNXwDFY8Bkdf6zJwWHLiqs4pyClXDZ2f6QiOs7y9IvJZ+wOIbsf4N5V6s06zOxJ0NAOwhe0mgWS3Us0zgXIfmW4BpmGnU4ql/qGL+9vNfyQJ7wxEJxVK7hiYh9Epu49E2jmefDqTX+SNSrDCg4HkRcxerxYGnAJDCP50QaNlyLSciODD6wHaddrSYkdvmISLMnLHug61OkE4OBIOWXfYV+e31kDj+zgczAfVQgekDKtaimCQclHFrmaEPl0KIm6wsDQAw5HWkepA/WZfv4SbCrDaKJDZw+LBI7dR0ezmiOH/zmWWrRW7D4wjkDGiumWjA8etuf8I4GRyC/d1RS+hnlvPr0Bu+WljuVxLoK3nhZOdiK5t4QlVDoGankkRjLylwFQgo8tzu5N0dc26z3ClowTwcKsjStmFr53gjCD7l3qoFjyPot1JlW3LPhG9Nch7rK33/7ONqVai3zxb1xB9ynd8TSzKi4/66LeYEDcGVM5A9Vmkp+egCnOhkOAXdI8O4jid98NANir+U4xmUYZ2PAMNmSeHlpSpwH2pC1/BHpDKA9RZEuEdr3sgmtuXXwwOCp+xvuVwxZZ6+gVEjG4nGTqSNxUIq1fzjGih8ElJtbM1Uhh2dVE9uxW7EC/oCuuk="
53-
on:
54-
tags: true
55-
all_branches: true
56-
condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
57-
repo: parse-community/parse-server
58-
- provider: script
59-
skip_cleanup: true
60-
script: ./resources/npm-git.sh
61-
on:
62-
branch: master
63-
condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
64-
- provider: script
65-
skip_cleanup: true
66-
script: ./resources/docker-hub.sh
67-
on:
68-
tags: true
69-
all_branches: true
70-
condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
46+
jobs:
47+
include:
48+
# release on github latest branch
49+
- stage: release
50+
node_js: '4.6'
51+
env:
52+
before_script: skip
53+
after_script: skip
54+
script: npm install -g nsp && nsp check
55+
deploy:
56+
- provider: script
57+
skip_cleanup: true
58+
script: ./resources/npm-git.sh
59+
on:
60+
branch: master
61+
- provider: npm
62+
skip_cleanup: true
63+
email:
64+
secure: "YweTGc22uqFWpzbfiUa5ptBLRAy6tt6d9TZLwEkPtmnsWzN9dguGyKWmXiw0qL+848FWQ5PWzUgBn5XdigV9tF3rJY6RGs8i38WulNjwSoGuRZa3AChsQHAb1KenANcJybzhnwgEj9gRsrGZPEsyI2whfake/xLDtG91kHjpJANsd4gseOh6fdS4FIYCbyXvSbC7S0yZzIJkgSkMqJO7RJ8r0HYQ7srYIw31dM3ZXSmUYu+GaMDUUu3RLAGYoKaROxhDRnzkjdeLLiwZH8hQ/6CaqwqX54iJ6OS+MOQU3fi5ZXalA7RZvtC4RmrcCkaTf3i0f+5xejYIFgzXdYGMVm8DUc82tDw1s4b6Pb19bgi1xXOQ0IKzRmZuGxnvkRN61dnYdnpnnNuG97HXgVjiOigZXVLZkWazUdnf9zXqmkC+KxPfa4Ldqg0TMjQ9J14n6TXxRti8Tt0xMa1Uzho7VdsxdJy35Bghy398O6X8VdX6parfzEkX7c/JzcA3TIMJ9+S1dy3J4Tb2URB5367W6h7cDeXtGmwLTFu75Q1CNqRJkUGbSrX2NyMqG5tc8oaTM+OWvLxcbKPRy9T6qN7x2JmCHHaapf8/8VR9wCy2PwE5j+KWhmctEHqqOgrtG5gsjC0eCPJsposxZWyM7M6aUpXe3w+olBfKq9apUGStUSU="
65+
api_key:
66+
secure: "QprkaqQ+WCvZQR4qIEs5iS6peMCbRd8Hgt0s6HfdmhavNXwDFY8Bkdf6zJwWHLiqs4pyClXDZ2f6QiOs7y9IvJZ+wOIbsf4N5V6s06zOxJ0NAOwhe0mgWS3Us0zgXIfmW4BpmGnU4ql/qGL+9vNfyQJ7wxEJxVK7hiYh9Epu49E2jmefDqTX+SNSrDCg4HkRcxerxYGnAJDCP50QaNlyLSciODD6wHaddrSYkdvmISLMnLHug61OkE4OBIOWXfYV+e31kDj+zgczAfVQgekDKtaimCQclHFrmaEPl0KIm6wsDQAw5HWkepA/WZfv4SbCrDaKJDZw+LBI7dR0ezmiOH/zmWWrRW7D4wjkDGiumWjA8etuf8I4GRyC/d1RS+hnlvPr0Bu+WljuVxLoK3nhZOdiK5t4QlVDoGankkRjLylwFQgo8tzu5N0dc26z3ClowTwcKsjStmFr53gjCD7l3qoFjyPot1JlW3LPhG9Nch7rK33/7ONqVai3zxb1xB9ynd8TSzKi4/66LeYEDcGVM5A9Vmkp+egCnOhkOAXdI8O4jid98NANir+U4xmUYZ2PAMNmSeHlpSpwH2pC1/BHpDKA9RZEuEdr3sgmtuXXwwOCp+xvuVwxZZ6+gVEjG4nGTqSNxUIq1fzjGih8ElJtbM1Uhh2dVE9uxW7EC/oCuuk="
67+
on:
68+
tags: true
69+
all_branches: true
70+
repo: parse-community/parse-server

0 commit comments

Comments
 (0)