Commit Graph
21 Commits
Author SHA1 Message Date
dosire c9fd0bd415 Add upgrader test. 2014-03-24 10:19:45 +01:00
Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
2014-03-21 12:22:43 +02:00
Dmitriy Zaporozhets c0090a3ff5 Merge branch 'cloud-update' into 'master'
Cloud Update

/cc @jacobvosmaer @marin @job
2014-03-20 11:56:18 +00:00
dosire 7d36d71d97 Run the RC on Cloud. 2014-03-19 12:46:18 +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
dosire 509c45163a Update references to gitlab dot com. 2014-03-10 17:40:40 +01:00
Dmitriy Zaporozhets 6182c54887 Improve manual testing document
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 16:20:51 +02:00
Job van der Voort c9a98ea45e add manual testing guide to docs 2014-02-21 16:15:45 +01:00
Dmitriy Zaporozhets e9cf2e140f Fix version sample for release candidate in monthly.md 2014-02-16 17:51:09 +00:00
dosire ac2038b0c9 Detail the merge window. 2014-01-27 14:16:13 +01:00
dosire f89df5b496 Do not branch from master until release is done. 2014-01-24 09:14:35 +01:00
dosire 604b38cd0a Remove deprecated twitter handle. 2014-01-22 10:00:25 +01:00
dosire 3aa57b77ae Ordinal numbers do not have the same ordinal. 2014-01-09 15:58:52 +01:00
dosire e270cd705b Since the 22th is fixed we can use absolute dates. 2014-01-09 15:55:57 +01:00
dosire 60e451fde4 Change canonical urls to GitLab Cloud. 2013-12-30 14:27:18 +01:00
Sytse Sijbrandij 3333d8b87b Include release candidates in the monthly release process. 2013-12-27 13:15:07 +00:00
Sytse Sijbrandij 6413bfb5c6 Merge branch 'master' into full-post-to-oss-security
Conflicts:
	doc/release/security.md
2013-11-19 16:38:43 +01:00
Sytse Sijbrandij 250a86d278 Also add CVE to changelog. 2013-11-18 17:45:28 +01:00
Sytse Sijbrandij 6cdd08965e Full post to OSS security. 2013-11-18 17:43:25 +01:00
Sytse Sijbrandij 9be86adbbc Inform community of our timing. 2013-11-17 08:46:04 -05:00
Sytse Sijbrandij 580049c04b Separate procedures for both releases. 2013-11-14 13:40:05 -05:00