Commit ced044ad249f794370ea111532a30f81a3c83408
Exists in
master
and in
4 other branches
Merge branch 'housekeeping-in-root-dir' of /home/git/repositories/gitlab/gitlabhq
Showing
2 changed files
with
5 additions
and
10 deletions
Show diff stats
README.md
| @@ -47,8 +47,6 @@ | @@ -47,8 +47,6 @@ | ||
| 47 | 47 | ||
| 48 | ### Installation | 48 | ### Installation |
| 49 | 49 | ||
| 50 | -Check out our [maintenance policy](MAINTENANCE.md) to see what versions are supported. | ||
| 51 | - | ||
| 52 | #### Official production installation | 50 | #### Official production installation |
| 53 | 51 | ||
| 54 | * [Installation guide for a production server](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md) | 52 | * [Installation guide for a production server](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md) |
| @@ -137,18 +135,20 @@ Start it with [Foreman](https://github.com/ddollar/foreman) | @@ -137,18 +135,20 @@ Start it with [Foreman](https://github.com/ddollar/foreman) | ||
| 137 | 135 | ||
| 138 | ### Getting help | 136 | ### Getting help |
| 139 | 137 | ||
| 138 | +* [Maintenance policy](MAINTENANCE.md) specifies what versions are supported. | ||
| 139 | + | ||
| 140 | * [Troubleshooting guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) contains solutions to common problems. | 140 | * [Troubleshooting guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) contains solutions to common problems. |
| 141 | 141 | ||
| 142 | * [Support forum](https://groups.google.com/forum/#!forum/gitlabhq) is the best place to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and had it resolved. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix. | 142 | * [Support forum](https://groups.google.com/forum/#!forum/gitlabhq) is the best place to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and had it resolved. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix. |
| 143 | 143 | ||
| 144 | * [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab. | 144 | * [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab. |
| 145 | 145 | ||
| 146 | -* [Support subscription](http://www.gitlab.com/subscription/) connect you to the knowledge of GitLab experts that will resolve your issues and answer your questions. | 146 | +* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed. |
| 147 | + | ||
| 148 | +* [Support subscription](http://www.gitlab.com/subscription/) connects you to the knowledge of GitLab experts that will resolve your issues and answer your questions. | ||
| 147 | 149 | ||
| 148 | * [Consultancy](http://www.gitlab.com/consultancy/) allows you hire GitLab experts for installations, upgrades and customizations. | 150 | * [Consultancy](http://www.gitlab.com/consultancy/) allows you hire GitLab experts for installations, upgrades and customizations. |
| 149 | 151 | ||
| 150 | -* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed. | ||
| 151 | - | ||
| 152 | 152 | ||
| 153 | ### Getting in touch | 153 | ### Getting in touch |
| 154 | 154 |
ROADMAP.md
| @@ -1,5 +0,0 @@ | @@ -1,5 +0,0 @@ | ||
| 1 | -## GitLab Roadmap | ||
| 2 | - | ||
| 3 | -Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456) as specified in the README. | ||
| 4 | - | ||
| 5 | -This ROADMAP file will be deprecated. |