home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,727 Commits 48 Branches 340 Tags
09f211ef4f032b7dfbc333754569896b34f0649f
Commit Graph
135 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets a15dc7b814 Add tip about EE and CE master synced before release rc1 2014-11-11 10:22:05 +00:00
Dmitriy Zaporozhets 1d1b211642 Use release tools in patch release 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 12:01:47 +02:00
Dmitriy Zaporozhets 07cca8cc0c Use release tool for monthly releases 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 11:47:44 +02:00
Sytse Sijbrandij bd0d679b23 Update patch manual to link to blog post. 2014-10-29 16:24:07 -07:00
Dmitriy Zaporozhets 08d361e8b3 Merge branch 'improve_release_doc' into 'master' 
Improvements for release documentation

See merge request !1203
 2014-10-27 16:56:22 +00:00
Valery Sizov fd44d0b6c2 update release doc 2014-10-27 16:02:21 +02:00
Dmitriy Zaporozhets 2f6856f713 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-27 12:00:19 +02:00
Valery Sizov 250d582bdd update patch document 2014-10-24 22:28:02 +03:00
Sytse Sijbrandij 6e9fb7facc Added relative dates, removed packages for GitLab.com. 2014-10-23 16:24:44 +02:00
Ben Bodenmiller aa923847b2 cleanup monthly release details 2014-10-21 14:23:58 -07:00
Sytse Sijbrandij e6631c8786 Merge request for blog post on gitlab.com next time. 2014-10-21 13:21:58 +02:00
Valery Sizov 6c476a8dac Improved release documentation 2014-10-21 12:04:09 +03:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Sytse Sijbrandij 8d7ed7e53b Add notice about weekend in release cycle. 2014-09-24 08:42:45 +02:00
Marin Jankovski 0f7cad07d0 Add to monthly doc that reverting a feature is an option. 2014-09-23 09:03:38 +02:00
Marin Jankovski c108839cb9 More updates to release doc. 2014-09-22 17:26:18 +02:00
Marin Jankovski 7d7ba112b6 Issue name of QA. 2014-09-22 17:15:53 +02:00
Marin Jankovski 68bb1701cd Update monthly release doc that we are not using travis anymore. 2014-09-22 17:15:53 +02:00
Marin Jankovski 3a9c294ac0 Add steps for building and deploying gitlab.com packages to monthly release document. 2014-09-22 17:15:53 +02:00
Marin Jankovski 0b85e2a606 Order of tasks in monthly release doc. 2014-09-22 17:15:53 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00
Dmitriy Zaporozhets 4bf3abe2b8 Create stable branch at 17th 2014-09-19 15:44:21 +00:00
Ben Bodenmiller 2b1137bd14 update rack_attack link to history page 2014-09-18 15:53:46 -07:00
Ben Bodenmiller c36b06e468 check resque.yml.example for config changes 2014-09-18 08:21:20 -07:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Ben Bodenmiller 6682f8d75d add missing config files to check during release process 2014-08-28 17:21:16 -07:00
Sytse Sijbrandij 45d887ad1c Merge branch 'master' into release-doc-improvements 
Conflicts:
	doc/release/monthly.md
 2014-08-26 15:45:58 +02:00
Sytse Sijbrandij 099e17038f Add note about testing the migrations. 2014-08-26 10:20:55 +02:00
Sytse Sijbrandij 075e5eeccb Change the version before creating the stable branch. 2014-08-26 10:04:57 +02:00
Sytse Sijbrandij 18ec2f93a6 Don't forget to cherry pick into stable. 2014-08-22 21:49:39 +02:00
Sytse Sijbrandij 47b5b3d5fa Tar before omnibus build, we all have master access on dev, don't forget to update installation.md 2014-08-22 21:46:12 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Robert Schilling abdc442648 Fix spelling errors in doc, closes #7437 
Further changes
 2014-08-07 10:27:54 +02:00
Jacob Vosmaer 914275ac0a Add omnibus-gitlab to the monthly release process 2014-07-28 15:11:27 +02:00
Sytse Sijbrandij 7da74468b3 Merge branch 'add-merge-moments-to-process' into 'master' 
Add merge moments to process

Fixes #1450

See merge request !986
 2014-07-27 15:32:26 +00:00
Sytse Sijbrandij ccfd881386 Integrate lessons from the latest release. 2014-07-23 09:00:19 +02:00
Sytse Sijbrandij 7738383f1b Simplofy the tweet. 2014-07-22 16:36:29 +02:00
Dmitriy Zaporozhets 961ea22246 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/projects_controller.rb
 2014-07-22 09:54:24 +03:00
Marin Jankovski 6604668d9b Update manual testing doc with syntax highlighting check. 2014-07-21 17:43:16 +02:00
Jacob Vosmaer 5093c800a7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-21 16:34:27 +02:00
Sytse Sijbrandij ebc1c4bde9 Account for the EE only situation. 2014-07-21 10:50:03 +02:00
Sytse Sijbrandij e443e59542 Simplify email procedure now that subscribers are on the newsletter list. 2014-07-21 10:47:38 +02:00