Merge branch 'roadmap-to-feedback' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents b1117dac c4ec1c7d
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
README.md
ROADMAP.md
@@ -82,7 +82,7 @@ Each month on the 22th a new version is released together with an upgrade guide.
  
 * [Changelog](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG)
  
-* [Roadmap](https://github.com/gitlabhq/gitlabhq/blob/master/ROADMAP.md)
+* 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).
  
  
 ### Getting started
 ## GitLab Roadmap
  
-### v5.1 April 22
+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.
  
-* Not decided yet.
+This ROADMAP file will be deprecated.
...	...	@@ -82,7 +82,7 @@ Each month on the 22th a new version is released together with an upgrade guide.
82	82
83	83	* [Changelog](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG)
84	84
85		-* [Roadmap](https://github.com/gitlabhq/gitlabhq/blob/master/ROADMAP.md)
	85	+* 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).
86	86
87	87
88	88	### Getting started
...	...
1	1	## GitLab Roadmap
2	2
3		-### v5.1 April 22
	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	4
5		-* Not decided yet.
	5	+This ROADMAP file will be deprecated.
...	...