home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,779 Commits 48 Branches 340 Tags
bb57ee0260989be29213e8c514b56d4075ff0f0f
Commit Graph
180 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Marin Jankovski 3e6b342a1a Remove CI sections related to release tool, update steps in monthly and patch release documentation. 2015-02-27 10:38:15 -08:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08:00
Douwe Maan 4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00
Dmitriy Zaporozhets 43890ed1dc Update patch release document 2015-02-09 10:46:38 -08:00
Dmitriy Zaporozhets 026494029e Update GitLab.com when packages are done. No need to wait 2 days for it 2015-02-09 10:32:56 -08:00
Dmitriy Zaporozhets c93f4662d8 Extract update guide to separate doc to prevent mess 2015-02-09 10:30:06 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Ewan Edwards ad6c372eee Fix a number of discovered typos, capitalization of developer and 
product names, plus a couple of instances of bad Markdown markup.
 2015-02-03 15:18:40 -08:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Dmitriy Zaporozhets 41353b6362 Fix code block in rc1 doc 2015-01-15 02:07:42 +00:00
Dmitriy Zaporozhets 7cf49f8c4a Merge branch 'ce-master' 
Conflicts:
	doc/update/6.x-or-7.x-to-7.7.md
 2015-01-14 17:53:36 -08:00
Dmitriy Zaporozhets 8e36070cce Remove bold text 2015-01-14 17:44:59 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Patricio Cano e588328674 Fixed wording in message. 2015-01-12 22:26:51 -05:00
Patricio Cano 0be1a45b9f Updated monthly.md add instructions about the handling of the CHANGELOG 
Added DISCLAIMER to CHANGELOG
 2015-01-12 22:19:22 -05:00
Sytse Sijbrandij 37163d7c75 Small spelling improvements. 2015-01-10 19:28:50 -08:00
Dmitriy Zaporozhets 1c3c8a9c55 Make ordered lists for release doc 2015-01-11 01:34:35 +00:00
Dmitriy Zaporozhets 2e3749cdcc Replace befor with before 2015-01-11 01:32:42 +00:00
Dmitriy Zaporozhets c736968695 Improve monthly.md with fixes proposed from Sytse 2015-01-10 02:14:45 +00:00
Dmitriy Zaporozhets b9dd52dd14 Improve monthly.md with fixes proposed from Sytse 2015-01-10 02:13:09 +00:00
Dmitriy Zaporozhets 606c701bd0 Improve monthly.md with fixes proposed from @sytse 2015-01-10 02:12:00 +00:00
Dmitriy Zaporozhets 3c19929c75 Cleanup and refactor release doc. Follow issue as a todo list 2015-01-09 12:29:48 -08:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Patricio Cano 4386c210a1 Updated the monthly release steps 2014-12-23 17:28:09 -05:00
Sytse Sijbrandij 6f4332725d Release manager should doublecheck the everyone has been mentioned in the blog post. 2014-12-23 13:39:31 +01:00
Job van der Voort 3eb239d6fc Merge branch 'release-announcement' into 'master' 
Release announcement

@dzaporozhets wants a hashtag https://gitlab.slack.com/archives/general/p1419317692000272

See merge request !1340
 2014-12-23 09:54:21 +00:00
Sytse Sijbrandij e8818da305 Shorter tweet so there is space for a hashtag. 2014-12-23 08:37:26 +01:00
Job van der Voort cc2f14ea0b Merge branch 'mention-the-team' into 'master' 
Mention the team

See merge request !1339
 2014-12-22 20:03:04 +00:00
Sytse Sijbrandij e99ea1146a Clear responsibility to mention the team. 2014-12-22 20:58:22 +01:00
Jeroen van Baarsen df32ad6c15 Merge pull request #8375 from bbodenmiller/process-fix 
update order of upgrade guide
 2014-12-17 09:37:07 +01:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Marin Jankovski 90a308ea00 Update release docs to deploy to GitLab.com before publishing. 2014-12-05 12:34:18 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Jacob Vosmaer 1aca371880 Add changes suggested by Sytse 2014-12-03 16:50:03 +01:00
Jacob Vosmaer cdabe73025 Fix EE RC1 tag name 2014-12-03 16:30:57 +01:00
Jacob Vosmaer a8ce1d88b5 Release CI at the same time as CE and EE 2014-12-03 15:40:12 +01:00
Jacob Vosmaer 4ce27042f9 The second gitlab.com deploy should be easy 2014-12-03 14:41:39 +01:00
Jacob Vosmaer 106de470c9 Use clickable checkboxes in issue template 2014-12-03 14:21:00 +01:00
Sytse Sijbrandij 30e28a7e0c Merge branch 'security-release' into 'master' 
Improve security release documentation

I think the MailChimp step is not needed anymore because we automated it.

See merge request !1271
 2014-12-01 09:52:10 +00:00
Jacob Vosmaer a0a3eba197 Explicitly mention patch releases 2014-11-24 14:59:54 +01:00
Jacob Vosmaer 4e3bf439cb Establish ownership of security releases 2014-11-24 12:14:19 +01:00
Jacob Vosmaer e0c870c045 The release manager handles all releases 2014-11-24 12:14:07 +01:00
Ben Bodenmiller e69db3ba5b update order of upgrade guide 
GitLab needs to be stopped when backup is took.
 2014-11-23 01:11:06 -08:00
Jacob Vosmaer f68003560d The blog post will trigger a mail to the list 2014-11-21 09:59:46 +01:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Dmitriy Zaporozhets e53f9b4d69 Merge branch 'gitlab.com-packages' into 'master' 
Gitlab.com uses special packages, build them first

See merge request !1255
 2014-11-14 14:25:41 +00:00
Jacob Vosmaer de3bef058e Gitlab.com uses special packages, build them first 2014-11-14 11:47:08 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Dmitriy Zaporozhets 116f73b540 Sync master branch before releasing rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 18:48:39 +02:00