home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,140 Commits 48 Branches 340 Tags
2bfa02bb3ccb2b176fa936ce7a70b75eeedce9ef
Commit Graph
852 Commits
Author SHA1 Message Date
Jacob Vosmaer ec73107d1c Subscribers should use subscribers@gitlab.com 2014-03-28 11:44:44 +01:00
Dmitriy Zaporozhets 3a293fa966 Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
 2014-03-25 10:12:59 +02:00
dosire c9fd0bd415 Add upgrader test. 2014-03-24 10:19:45 +01:00
Dmitriy Zaporozhets 919bc9792a Merge branch 'update-install-doc-branch' into '6-7-stable' 
Update Install Doc Branch

/cc @marin
 2014-03-21 18:00:49 +00:00
dosire a9863ed0ee Should be 6-7. 2014-03-21 18:34:59 +01:00
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
Marin Jankovski 895c913247 Use the latest tag, 1.9.1 for gitlab-shell. 2014-03-21 12:42:59 +01:00
Marin Jankovski 6d9dccbec8 Checkout gitlab-shell v 1.9.0 2014-03-21 12:26:34 +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
Dmitriy Zaporozhets 303d131102 Merge branch 'deploy-key-doc' into 'master' 
Deploy Key Doc

/cc @marin @job @jacobvosmaer
 2014-03-20 11:54:34 +00:00
Evgeniy Sokovikov 4f68e15d9e typo fix 2014-03-19 20:08:26 +03:00
Sytse Sijbrandij 16f18227a8 Merge pull request #6535 from docwhat/sys-hooks-eols 
Switched line endings to LF for system_hooks.md
 2014-03-19 15:23:37 +01:00
Job van der Voort a8adad9ccd add 6.6-ce-to-ee guide 2014-03-19 14:52:17 +01:00
dosire 7d36d71d97 Run the RC on Cloud. 2014-03-19 12:46:18 +01:00
dosire d09f5796bf Split up the lines for Jacob. 2014-03-18 16:25:54 +01:00
dosire 257aa851d2 Deploy key needed documentation. 2014-03-18 16:24:49 +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
Sytse Sijbrandij b36441f4d6 Merge pull request #6529 from MrKeiKun/system-hook-fix 
Fixed some minor typos
 2014-03-17 16:11:06 +01:00
Dmitriy Zaporozhets 493c7a6147 Merge branch 'links_within_same_repo' into 'master' 
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
 2014-03-17 14:06:08 +00: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 86c76eccea Add more api docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:22:39 +02:00
Marin Jankovski 656d9548bc Update markdown documentation, fix wiki spec. 2014-03-17 13:23:04 +01:00
Kei ac09f6deb9 Fixed some minor typos. 2014-03-16 03:45:00 +08:00
Christian Höltje 901976d972 Switched line endings to LF for system_hooks.md 
It was checked in with Windows style line endings.
 2014-03-14 14:53:43 -04:00
Marco Vito Moscaritolo 599ee9670d Fixed error on mysql install link 
Fixed error on install guide to mysql conf page.
 2014-03-13 22:04:36 +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
Jacob Vosmaer 72345134f0 Add new 6.6.3 packages 2014-03-12 13:18:16 +01:00
Dmitriy Zaporozhets dcda7516d6 Use username instead of wierd email for first login 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 12:18:14 +02:00
dosire 509c45163a Update references to gitlab dot com. 2014-03-10 17:40:40 +01:00
dosire 339fce559a Add enterprise linux distributions as officially supported. 2014-03-07 16:35:59 +01:00
Job van der Voort b616bc81bf Fixes #1, Fixes #10, Fixes #17 2014-03-07 15:18:41 +01:00
Ciro Santillli 8199ba05b8 Correct typos in web_hooks help. 2014-03-07 09:43:14 +01:00
Jacob Vosmaer 97843b58d9 Add MD5 for package 2014-03-07 08:50:43 +01:00
Jacob Vosmaer 5b0d4e6174 Add EE package download information 2014-03-07 08:48:19 +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
Jeroen van Baarsen c06f4cd42f JSON Lint the web-hooks.md file 
Thanks to @jojosch for the initial work on the web-hooks.html.haml file!
 2014-02-28 19:31:14 +01:00
Jeroen van Baarsen 564c37d9b6 Moved all the help files to markdown files: 
Files moved:
* Workflow
* help/ssh
* help/webhooks
* help/system_hooks
* help/public_access
* help/permissions
 2014-02-28 19:30:13 +01:00
Stefan Wolf 37e211822e fixed typo in user management help page 2014-02-27 15:02:57 +01:00
Jacob Vosmaer 324749486f Use tags to do minor updates of GitLab 2014-02-27 12:39:04 +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
Jacob Vosmaer 4c746c2522 Add shell commands guide 2014-02-25 11:53:01 +01:00
Dmitriy Zaporozhets 95b0a7a9e6 Merge branch 'manual-testing' into 'master' 
Manual Testing

/cc @sytse
 2014-02-24 11:25:00 +00: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
Job van der Voort c9a98ea45e add manual testing guide to docs 2014-02-21 16:15:45 +01:00