Commit Graph
167 Commits
Author SHA1 Message Date
Marin Jankovski 020b681688 Update gitlab-shell version in documentation. 2014-03-21 14:11:36 +01:00
Marin Jankovski 758149bb75 Update ce to ee guide to use correct assets commands. 2014-03-21 13:35:29 +01:00
Job van der Voort a8adad9ccd add 6.6-ce-to-ee guide 2014-03-19 14:52:17 +01:00
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
Dmitriy Zaporozhets 66c4a7dba1 Merge branch 'mysql-to-og' into 'master'
MySQL to Postgres script
2014-03-17 13:57:52 +00:00
dosire 70994c348d Postgresql conversion script. 2014-03-17 14:55:56 +01:00
Dmitriy Zaporozhets 3082d2a4be Merge branch 'tighten_logrotate' into 'master'
Tighten Logrotate
2014-03-13 20:07:57 +00:00
Dmitriy Zaporozhets 42ef81be54 Merge branch 'patch_update_robustness' into 'master'
Patch Update Robustness
2014-03-13 20:07:19 +00:00
Jacob Vosmaer 85a4d1ec6c Update the logrotate configuration in 6.7 2014-03-12 16:01:34 +01:00
Jacob Vosmaer 3e6fe8bff0 Add 6.6-to-6.7.md update guide 2014-03-12 16:01:10 +01: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
Jacob Vosmaer 324749486f Use tags to do minor updates of GitLab 2014-02-27 12:39:04 +01:00
Dmitriy Zaporozhets 0e45bf5431 Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
2014-02-24 12:46:25 +02:00
Dmitriy Zaporozhets 490f99d45e New stable branches and update guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-21 17:07:43 +02:00
Dmitriy Zaporozhets 4fe147c0b0 Merge branch 'ce_6_6' into 'master'
6.6.0.beta1 from GitLab CE
2014-02-19 19:51:35 +00:00
Dmitriy Zaporozhets cf413ffb75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb
2014-02-19 14:55:07 +02:00
Job van der Voort 0cd8024d7c update readme to update to gitlab shell 1.7.9 2014-02-19 11:19:18 +01:00
Robert Djurasaj c131c185ac Update upgrader.md ... safety first 2014-02-13 21:50:02 -07:00
Jeroen van Baarsen 5ed87ab7cc Fixes #6311: cp the init.d file locally instead of remote 2014-02-13 21:14:20 +01:00
Marin Jankovski bccc2729ef Update minor version upgrade guide get latest code section. 2014-02-12 17:42:56 +01:00
Marin Jankovski 1c629b62c7 Remove empty lines. 2014-02-12 13:26:43 +01:00
Marin Jankovski 245d68eef8 Update minor versions upgrade guides get latest code section. 2014-02-12 13:25:05 +01:00
Marin Jankovski 50ccfe30b6 Make command for EE checkout more clear. 2014-02-12 11:28:47 +01:00
Dmitriy Zaporozhets 1284f21c07 Merge pull request #6264 from robertd/update_upgrade_guide
Update upgrade guide if you have more than one backup .tar file
2014-02-11 15:33:06 +02:00
Dmitriy Zaporozhets e1c1e882b3 Merge branch 'layout-of-upgrader'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/upgrader.md
2014-02-11 11:10:01 +02:00
Sytse Sijbrandij 345694384e Merge pull request #5975 from terrywang/fix-update-doc
Fix numbering in 6.3-to-6.4.md
2014-02-11 09:55:23 +01:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
2014-02-11 10:15:13 +02:00
Robert Schilling 898d4fe37d Fixes #6187, Update dead links 2014-02-09 18:53:06 +01:00
Robert Djurasaj ff45c9755f Update upgrade guide if you have more than one backup .tar file 2014-02-06 12:20:23 -07:00
Jacob Vosmaer 6221dc5846 Add 6.5 CE to EE update guide 2014-01-28 18:25:46 +01:00
dosire f591e4a48c Explain stash. 2014-01-27 13:51:01 +01:00
Sytse Sijbrandij e8dedc6de5 Merge branch 'master' of /mnt/ebs/repositories/sriharsha.vardhan/gitlab-ce 2014-01-26 15:21:11 +00:00
dosire b057e58b6f Reword upgrade -y comment, improve layout and allow just y. 2014-01-23 11:44:53 +01:00
dosire 03e0a759af Include a note for people that think the headers are wrong. 2014-01-23 08:57:28 +01:00
harsha 2b829aebc7 Correct section number for 'Check application status' 2014-01-22 19:31:48 +00:00
Jacob Vosmaer 96ed6c4569 Replace 6.0-to-6.4.md with 6.0-to-6.5.md 2014-01-22 16:00:50 +01:00
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
2014-01-21 18:15:49 +02:00
Dmitriy Zaporozhets 9cc9e9cd9a Update from 6.4 to 6.5 guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-21 13:30:33 +02:00
Jacob Vosmaer da817a1f56 Add EE checkout instructions to update docs 2014-01-20 10:38:16 +01:00
Marin Jankovski 2320167751 Upgrade guide for 6-4 ce to ee. 2014-01-06 18:43:29 +01:00
dosire 54ddca5c4e Simplify upgrade guide based on 6-4 functionality mentioned by Jacob. 2014-01-06 14:12:30 +01:00
Dmitriy Zaporozhets 779355ae8e Merge branch 'dogfood'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/6.0-to-6.4.md
2014-01-03 22:58:48 +02:00
Terry Wang 0fefbad6c9 Unify markdown syntax for Bash commands 2014-01-03 16:54:05 +11:00
Terry Wang 4105878ae7 Fix numbering in 6.3-to-6.4.md 2014-01-03 16:46:39 +11:00
dosire 60e451fde4 Change canonical urls to GitLab Cloud. 2013-12-30 14:27:18 +01:00
dosire 2cc162d687 Forgot to change the title. 2013-12-30 11:02:15 +01:00
dosire 92343f42ba Fast update can also be done for 6.4. 2013-12-30 11:00:45 +01:00
Dmitriy Zaporozhets 055b3c4dd6 Mention that Upgrader works for 6.4.2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-23 20:02:38 +02:00
Dmitriy Zaporozhets bfcaf4e543 GitLab Upgrader requires v6.4.0+
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-23 16:41:06 +02:00
Dmitriy Zaporozhets cc0d550f47 Add docs for upgrader script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-23 14:15:22 +02:00