IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:discourse/discourse

Browse Source
This commit is contained in:
Sam Saffron 2013-02-06 12:14:06 +11:00
commit 135a23297a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONTRIBUTING.md
View File

@ -2,7 +2,7 @@
## Before You Start ## Before You Start
Anyone wishing to contribute to the **[Discourse/Core](https://github.com/discourse/core)** project **MUST read & sign the [Discourse Forums Contribution License Agreement](https://github.com/discourse/core-cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/discourse/discourse)** project **MUST read & sign the [Electronic Discourse Forums Contribution License Agreement](https://docs.google.com/a/discourse.org/spreadsheet/viewform?formkey=dGUwejFfbDhDYXR4bVFMRG1TUENqLWc6MQ)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first.
## Reporting Bugs ## Reporting Bugs
@ -31,13 +31,13 @@ Anyone wishing to contribute to the **[Discourse/Core](https://github.com/discou
1. Clone the Repo: 1. Clone the Repo:
``` ```
git clone git://github.com/discourse/core.git git clone git://github.com/discourse/discourse.git
``` ```
2. Create a new Branch: 2. Create a new Branch:
``` ```
cd core cd discourse
git checkout -b new_discourse_branch git checkout -b new_discourse_branch
``` ```
@ -49,7 +49,7 @@ Anyone wishing to contribute to the **[Discourse/Core](https://github.com/discou
* Include tests, and ensure they pass. * Include tests, and ensure they pass.
* Remember to check to see if your new functionality has an impact on our Documentation, and include updates as appropriate. * Remember to check to see if your new functionality has an impact on our Documentation, and include updates as appropriate.
Completing these steps will increase the chances of your code making it into **[Discourse/Core](https://github.com/discourse/core)**. Completing these steps will increase the chances of your code making it into **[Discourse/Discourse](https://github.com/discourse/discourse)**.
4. Commit 4. Commit
@ -64,7 +64,7 @@ Anyone wishing to contribute to the **[Discourse/Core](https://github.com/discou
Ensure that if you supply a multitude of commits, they are **squashed into a single commit**: Ensure that if you supply a multitude of commits, they are **squashed into a single commit**:
``` ```
git remote add upstream https://github.com/discourse/core.git git remote add upstream https://github.com/discourse/discourse.git
git fetch upstream git fetch upstream
git checkout new_discourse_branch git checkout new_discourse_branch
git rebase upstream/master git rebase upstream/master
@ -86,7 +86,7 @@ Anyone wishing to contribute to the **[Discourse/Core](https://github.com/discou
6. Fork 6. Fork
``` ```
git remote add mine git@github.com:<your user name>/core.git git remote add mine git@github.com:<your user name>/discourse.git
``` ```
7. Push to your remote 7. Push to your remote

4
DEVELOPMENT.md
View File

@ -11,8 +11,8 @@ on Discourse with:
2. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads 2. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads
3. Install Ruby 1.9.3. We recommend RVM: https://rvm.io/ 3. Install Ruby 1.9.3. We recommend RVM: https://rvm.io/
4. Open a terminal 4. Open a terminal
5. Clone the project: `git@github.com:discourse/core.git` 5. Clone the project: `git@github.com:discourse/discourse.git`
6. Enter the project directory: `cd core` 6. Enter the project directory: `cd discourse`
7. Install vagrant: `gem install vagrant` 7. Install vagrant: `gem install vagrant`
### Using Vagrant ### Using Vagrant

4
README.md
View File

@ -1,4 +1,4 @@
<a href="http://www.discourse.org/">![Logo](https://raw.github.com/discourse/core/master/images/discourse.png)</a> <a href="http://www.discourse.org/">![Logo](https://raw.github.com/discourse/discourse/master/images/discourse.png)</a>
Discourse is the 100% open source, next-generation discussion platform built for the next 10 years of the Internet. Discourse is the 100% open source, next-generation discussion platform built for the next 10 years of the Internet.
@ -53,7 +53,7 @@ accepts contributions from the public, and we'd like you to be a part of that co
In order to be prepared for contributing to Discourse, please: In order to be prepared for contributing to Discourse, please:
1. Review the **VISION** section above, which will help you understand the needs of the team, and the focus of the project, 1. Review the **VISION** section above, which will help you understand the needs of the team, and the focus of the project,
2. Read & sign the **[Discourse Forums Contribution License Agreement](https://github.com/discourse/core-cla)**, to confirm you've read and acknowledged the legal aspects of your contributions, and 2. Read & sign the **[Electronic Discourse Forums Contribution License Agreement](https://docs.google.com/a/discourse.org/spreadsheet/viewform?formkey=dGUwejFfbDhDYXR4bVFMRG1TUENqLWc6MQ)**, to confirm you've read and acknowledged the legal aspects of your contributions, and
3. Dig into **[CONTRIBUTING.MD](https://github.com/discourse/core/blob/master/CONTRIBUTING.md)**, which houses all of the necessary info to: 3. Dig into **[CONTRIBUTING.MD](https://github.com/discourse/core/blob/master/CONTRIBUTING.md)**, which houses all of the necessary info to:
* submit bugs, * submit bugs,
* request new features, and * request new features, and