home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7081 from cirosantilli/conflict-artifact

Browse Source 
Remove conflict artifact.
This commit is contained in:
Sytse Sijbrandij
2014-06-05 16:46:09 +02:00
parent 70a6af9328 27f32ac648
commit 63cbebfe6c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/install/requirements.md
-1
View File
@@ -41,7 +41,6 @@ Please consider using a virtual machine to run GitLab.
GitLab requires Ruby (MRI) 2.0 or 2.1
>>>>>>> Update docs to markdown style guide.
You will have to use the standard MRI implementation of Ruby.
We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.