home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,161 Commits 48 Branches 340 Tags
4e8cc3e19f7c13435c360e7ccaaa9cc860cbff34
Commit Graph
118 Commits
Author SHA1 Message Date
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
Sytse Sijbrandij 3926150f5f Improve rc tweet. 2014-07-18 15:17:40 +02:00
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Sytse Sijbrandij 9e3694a6e3 Seperate CE in EE merge. 2014-07-16 11:27:18 +02:00
Sytse Sijbrandij 332a3c6d48 Make rc1 for GitLab.com complete and fix boldness. 2014-07-16 11:02:41 +02:00
Sytse Sijbrandij c3a7d3e147 Link to issues with # 2014-07-16 08:38:19 +02:00
Sytse Sijbrandij e043da1376 Split work to the 17th and make issue template. 2014-07-15 21:53:20 +02:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Sytse Sijbrandij 379ffbb262 Link to regression issue from the tweet. 2014-06-27 10:46:52 +02:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets 88659eebb0 Merge branch 'regression-issue-on-rc' into 'master' 
Regression issue on rc
 2014-06-23 06:35:38 +00:00
Sytse Sijbrandij 6f7cf8692c Create the regression issue when the rc is released. 2014-06-22 14:03:52 +02:00
Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
 2014-06-20 13:27:27 +02:00
Dmitriy Zaporozhets 55512a80a6 During release we need to create several update guides 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-19 14:40:42 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Sytse Sijbrandij d2d99521b6 Clarify the master branch release instructions. 2014-06-11 10:37:48 +02:00
Marin Jankovski dca6c490cc Update check task and add to monthly release doc lines about gitlab_shell_version file. 2014-06-10 11:16:47 +02:00
Jacob Vosmaer 1a87fb754e Protect stable branches 2014-06-06 09:36:19 +02:00