kopia lustrzana https://github.com/c9/core
Merge remote-tracking branch 'origin/wf-create-test' into refactor-create-api
Conflicts: plugins/c9.api.project/create_test.jspull/282/head
Matthijs van Henten
commit
b20bc293c4
|
|
@ -907,8 +907,12 @@ module.exports = function(options) {
|
|||
});
|
||||
}
|
||||
|
||||
if (options.platform !== "win32")
|
||||
plugins.push("plugins/c9.ide.language.codeintel/codeintel");
|
||||
if (options.platform !== "win32") {
|
||||
plugins.push({
|
||||
packagePath: "plugins/c9.ide.language.codeintel/codeintel",
|
||||
preinstalled: hosted && !options.ssh,
|
||||
});
|
||||
}
|
||||
|
||||
return plugins;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -695,6 +695,31 @@ API Documentation
|
|||
|
||||
All classes and public API should be documented using [JSDuck annotations](https://github.com/senchalabs/jsduck).
|
||||
|
||||
Commit messages
|
||||
---------------
|
||||
|
||||
We try to adhere to https://github.com/blog/926-shiny-new-commit-styles and to a lesser extent http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html.
|
||||
Don't write `I fixed a bug` or `Fixed bug`, or even `Added a cool fix for bug`. Just write `Fix bug in wrop wraffles` or `Add feature flip floppers`, present tense.
|
||||
|
||||
Branch Naming
|
||||
-------------
|
||||
|
||||
We follow the uni-repo approach so our source code is in one place. To work around some of the issues - for example looking at all PRs affecting a certain service - we prefix branches with the name of the service(s) the branch affects.
|
||||
|
||||
PR branch names, e.g.
|
||||
|
||||
“api-”, “ide-”, “multi-ide-vfs-sapi-”
|
||||
|
||||
Checking for branch naming consistency is part of the review process and the teams responsibility.
|
||||
|
||||
Use “all-” in case of doubt. E.g., https://github.com/c9/newclient/pull/12962/files affects redis schema code.
|
||||
|
||||
Generally, releasing changes affecting several services is a smell so this can help you identify possible issues.
|
||||
|
||||
You can now look for all PRs which made it in like so (api in this case):
|
||||
|
||||
git log --oneline --first-parent SHA..origin/master | grep -v bump | grep api-
|
||||
|
||||
Other Resources
|
||||
===============
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,9 @@ define(function(require, exports, module) {
|
|||
name: user.fullname || user.name,
|
||||
pricingPlan: user.premium ? "Premium" : "Free",
|
||||
referredBy: user.referrer,
|
||||
region: user.region
|
||||
region: user.region,
|
||||
usertype: user.usertype,
|
||||
purpose: user.purpose,
|
||||
};
|
||||
|
||||
return traits;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "c9",
|
||||
"description": "New Cloud9 Client",
|
||||
"version": "3.1.1893",
|
||||
"version": "3.1.1945",
|
||||
"author": "Ajax.org B.V. <info@ajax.org>",
|
||||
"private": true,
|
||||
"main": "bin/c9",
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
"c9"
|
||||
],
|
||||
"c9plugins": {
|
||||
"c9.ide.language": "#f03e5ca0c8",
|
||||
"c9.ide.language": "#fff9c75928",
|
||||
"c9.ide.language.css": "#be07d72209",
|
||||
"c9.ide.language.generic": "#92210f5a48",
|
||||
"c9.ide.language.html": "#22fdc74869",
|
||||
|
|
@ -64,9 +64,9 @@
|
|||
"c9.ide.language.javascript.immediate": "#c8b1e5767a",
|
||||
"c9.ide.language.javascript.eslint": "#4de5457db1",
|
||||
"c9.ide.language.javascript.tern": "#b55d0069bb",
|
||||
"c9.ide.language.javascript.infer": "#325ac6880e",
|
||||
"c9.ide.language.javascript.infer": "#18acb93a3a",
|
||||
"c9.ide.language.jsonalyzer": "#4b329741b1",
|
||||
"c9.ide.language.codeintel": "#046d39603b",
|
||||
"c9.ide.language.codeintel": "#871d8e5e5d",
|
||||
"c9.ide.collab": "#11a0d3c5ce",
|
||||
"c9.ide.local": "#10eb45842a",
|
||||
"c9.ide.find": "#e33fbaed2f",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset='utf-8'>
|
||||
<title><%=error%></title>
|
||||
<title>503 - Service Unavailable</title>
|
||||
<link rel="stylesheet" type="text/css" href="<%=staticPrefix%>/error_handler/style.css" />
|
||||
</head>
|
||||
<body class="error503 light">
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ function main(config, settings, options, callback) {
|
|||
findAllAndPurge: function(maxVfsAge, callback) {
|
||||
callback(null, [{}]);
|
||||
}
|
||||
}
|
||||
},
|
||||
"User": {}
|
||||
},
|
||||
"redis": {},
|
||||
"health": {
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue