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

..

2.6-to-3.0.md

move the update guides from the wiki into the repo

2013-04-30 09:29:30 +02:00

2.9-to-3.0.md

move the update guides from the wiki into the repo

2013-04-30 09:29:30 +02:00

3.0-to-3.1.md

move the update guides from the wiki into the repo

2013-04-30 09:29:30 +02:00

3.1-to-4.0.md

move the update guides from the wiki into the repo

2013-04-30 09:29:30 +02:00

4.0-to-4.1.md

Fix typos

2013-07-29 12:47:06 +02:00

4.1-to-4.2.md

Add -H to sudo commands in 4.1-to-4.2.md

2013-10-02 09:29:40 +02:00

4.2-to-5.0.md

Add security warnings to update docs

2013-11-02 16:49:26 +01:00

5.0-to-5.1.md

Clarify upgrade steps

2013-11-02 17:24:43 +01:00

5.1-to-5.2.md

Change canonical urls to GitLab Cloud.

2013-12-30 14:27:18 +01:00

5.1-to-5.4.md

Change canonical urls to GitLab Cloud.

2013-12-30 14:27:18 +01:00

5.1-to-6.0.md

Change canonical urls to GitLab Cloud.

2013-12-30 14:27:18 +01:00

5.2-to-5.3.md

Change canonical urls to GitLab Cloud.

2013-12-30 14:27:18 +01:00

5.3-to-5.4.md

Change canonical urls to GitLab Cloud.

2013-12-30 14:27:18 +01:00

5.4-to-6.0.md

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6

2014-02-19 14:55:07 +02:00

6.0-ce-to-ee.md

Add assets:precompile to CE-to-EE update steps

2013-12-02 14:39:28 +01:00

6.0-to-6.1.md

Merge branch 'ce_6_6' into 'master'

2014-02-19 19:51:35 +00:00

6.0-to-6.2.md

Change canonical urls to GitLab Cloud.

2013-12-30 14:27:18 +01:00

6.0-to-6.5.md

Update minor versions upgrade guides get latest code section.

2014-02-12 13:25:05 +01:00

6.1-ce-to-ee.md

Add assets:precompile to CE-to-EE update steps

2013-12-02 14:39:28 +01:00

6.1-to-6.2.md

update readme to update to gitlab shell 1.7.9

2014-02-19 11:19:18 +01:00

6.2-ce-to-ee.md

Add assets:precompile to CE-to-EE update steps

2013-12-02 14:39:28 +01:00

6.2-to-6.3.md

Remove empty lines.

2014-02-12 13:26:43 +01:00

6.3-ce-to-ee.md

Add 6.3 CE-to-EE update guide

2013-12-02 14:40:08 +01:00

6.3-to-6.4.md

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6

2014-02-19 14:55:07 +02:00

6.4-ce-to-ee.md

Upgrade guide for 6-4 ce to ee.

2014-01-06 18:43:29 +01:00

6.4-to-6.5.md

Update minor version upgrade guide get latest code section.

2014-02-12 17:42:56 +01:00

6.5-ce-to-ee.md

Add 6.5 CE to EE update guide

2014-01-28 18:25:46 +01:00

6.5-to-6.6.md

New stable branches and update guide

2014-02-21 17:07:43 +02:00

6.6-to-6.7.md

Update the logrotate configuration in 6.7

2014-03-12 16:01:34 +01:00

mysql-to-postgresql.md

Postgresql conversion script.

2014-03-17 14:55:56 +01:00

patch_versions.md

Merge branch 'patch_update_robustness' into 'master'

2014-03-13 20:07:19 +00:00

ruby.md

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

upgrader.md

Update upgrader.md ... safety first

2014-02-13 21:50:02 -07:00