Commit c16820e0 authored by Benjamin Bouvier's avatar Benjamin Bouvier
Browse files

Finish migration to Framagit and use the master branch by default from now on;

parent 57cf6c46
language: node_js
node_js:
- "0.10"
# TL;DR
- Branch off `incoming`.
- Branch off `master`.
- One feature per commit.
- In case of changes request, amend your commit.
......@@ -23,9 +23,9 @@ nodes](https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit).
# About branches
- `master` contains a stable version of the code for CozyCloud releases.
- `incoming` contains all changes in the current development version, including
- `master` contains all changes in the current development version, including
some experimental features that could break in production.
- `builds` contains a stable version of the code for releases.
# How to contribute
......@@ -33,18 +33,15 @@ nodes](https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit).
about it, or please open one otherwise. This will ensure that everybody is on
track for the feature and willing to see it in Kresus.
- One commit per feature.
- Branch off the `incoming` branch\*.
- Branch off the `master ` branch.
- Test your code with `make test`. This also runs linting and a few consistency
checks.
- Ideally, your pull-request should be mergeable without any merge commit, that
- Ideally, your merge-request should be mergeable without any merge commit, that
is, it should be a fast-forward merge. For this to happen, your code needs to
be always rebased onto `incoming`. Again, this is something nice to have that
be always rebased onto `master`. Again, this is something nice to have that
I expect from recurring contributors, but not a big deal if you don't do it
otherwise.
- I'll look at it and might ask for a few changes. In this case, please amend
your commit, rather than creating new commits.
\*Unless on very special occasions (bug in production servers making it
impossible to use Kresus at all), all pull requests based on another branch are
very likely to be refused with a request to rebase onto `incoming` (unless they
can be fast-forward merged onto `incoming`).
- I'll look at it and might ask for a few changes. In this case, please create
new commits. When the final result looks good, I may ask you to squash the
WIP commits into a single one, to maintain the invariant of "one feature, one
commit".
# Kresus
### :warning: Kresus is slowly migrating to a Gitlab instance hosted by [Framasoft](http://framasoft.org/) on [Framagit](https://framagit.org/); the new repository will be located [here](https://framagit.org/bnjbvr/kresus), issues should be opened [there](https://framagit.org/bnjbvr/kresus/issues).
![Travis CI status](https://img.shields.io/travis/bnjbvr/kresus.svg)
Kresus is an open-source [libre](LICENSE) self-hosted personal finance manager.
......@@ -36,7 +34,7 @@ If you already have a Cozy instance set up, then you can install Kresus either
from the Marketplace or by hopping on the machine and running the following
command:
cozy-monitor install kresus -r https://github.com/bnjbvr/kresus
cozy-monitor install kresus -r https://framagit.org/bnjbvr/kresus.git@builds
## Standalone install on Debian
......@@ -106,7 +104,7 @@ You'll need the following firewall authorizations:
See [contributing](CONTRIBUTING.md).
A big thank you to [all contributors](https://github.com/bnjbvr/kresus/graphs/contributors)!
A big thank you to [all contributors](https://framagit.org/bnjbvr/kresus/graphs/master)!
# Code of conduct
......
......@@ -10,7 +10,7 @@ export default class WeboobInstallReadme extends React.Component {
</h1>
<div className="well">
{ $t('client.weboobinstallreadme.content') }
<a href="https://github.com/bnjbvr/kresus/blob/incoming/README.md">README</a>.
<a href="https://framagit.org/bnjbvr/kresus/blob/incoming/README.md">README</a>.
</div>
</div>
);
......
......@@ -21,7 +21,7 @@ export default class About extends React.Component {
<div className="btn-group">
<a className="btn btn-default"
href="https://github.com/bnjbvr/kresus"
href="https://framagit.org/bnjbvr/kresus"
target="_blank">
<i className="fa fa-code"></i> { $t('client.settings.sources') }
</a>
......
......@@ -8,7 +8,7 @@
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/bnjbvr/kresus"
"url": "https://framagit.org/bnjbvr/kresus"
},
"main": "client/main.js",
"dependencies": {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment