home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,141 Commits 48 Branches 340 Tags
4e9d2808ade8b406de2962539734cfcefe586d76
Commit Graph
8 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +02:00
Arif Ali 28f40b7205 prioritise postgres in doc/update/patch_versions.md, assume postgres in doc/update/ruby.md 2014-03-04 00:40:30 +00:00
dosire 60e451fde4 Change canonical urls to GitLab Cloud. 2013-12-30 14:27:18 +01:00
Philippe Lafoucrière 4f61da6943 Tiny typo 2013-12-05 08:30:30 +01:00
Tandrial b6e3f391e7 Update ruby.md 
Trying to install the gem bundle without bundler fails with:
/usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:296:in `to_specs': Could not find 'bundler' (>= 0) among 8 total gem(s) (Gem::LoadError)
        from /usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:307:in `to_spec'
        from /usr/local/lib/ruby/2.0.0/rubygems/core_ext/kernel_gem.rb:47:in `gem'
        from /usr/local/bin/bundle:22:in `<main>'

Installing the bundler (with sudo gem install bundler) at the end of Step 4 fixes this.
 2013-11-29 21:43:40 +01:00
Sytse Sijbrandij 224d2c1696 Here is undefined. 2013-11-25 15:29:08 +01:00
Jacob Vosmaer f884605d6f Be more specific about what Ruby to use 2013-11-25 13:59:35 +01:00
Jacob Vosmaer b65129b685 Add Ruby upgrade instructions 2013-11-25 13:55:09 +01:00