home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
272 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a2e5ec7c40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into release-candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-07-17 18:17:32 +03:00
Dmitriy Zaporozhets f59a721ee0 Point installation manual to 7-1-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:54 +03: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
Marin Jankovski cb4d8eff4c Add sanitize option to documentation. 2014-07-07 14:41:02 +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 614e0857d6 Merge pull request #7162 from olivierlambert/patch-1 
Missing quote in the install doc
 2014-06-24 10:39:56 +03:00
Robert Schilling bf1f8a0e0f Update ruby version to 2.1.2, fixes #362 related to #360 2014-06-23 18:19:14 +02:00
Olivier Lambert 8a35660e40 Missing quote in the install doc 
Just a minor fix ;)
 2014-06-20 13:48:14 +02:00
Marin Jankovski 484819063c Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-06-19 09:22:51 +02:00
Dmitriy Zaporozhets 2b6b07f31e Bump shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 13:05:33 +03:00
Dmitriy Zaporozhets 8f8a6bf2c2 Point to 7-0-stable in installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 12:54:54 +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
Dmitriy Zaporozhets 76e2564018 Recommend setup git 2.0 for installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:10:58 +03:00
Sytse Sijbrandij 5d95fc6726 Link in code sections do not work. 2014-06-10 14:45:03 +02:00
Sytse Sijbrandij 95af7123bb Reformulate some of the https instructions. 2014-06-10 14:43:11 +02:00
Sytse Sijbrandij 772f2f1ac8 Merge branch 'https_documentation' into 'master' 
Https in installation document
 2014-06-10 12:32:25 +00:00
Marin Jankovski fa9c39591c Extract gitlab-shell configuration note to gitlab-shell section. 2014-06-10 12:57:50 +02:00
Marin Jankovski b980ab407e Update installation doc to mention using https. 2014-06-10 11:58:11 +02:00
Dmitriy Zaporozhets 1687095db6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-10 12:40:28 +03:00
Marin Jankovski 3affaa9b98 Add python-docutils to dependency list. 2014-06-10 10:40:28 +02:00
Dmitriy Zaporozhets a93ae9dc61 Merge pull request #7043 from jvanbaarsen/update-installation-dox 
We need to change config in step 5
 2014-06-09 22:12:45 +03:00
Achilleas Pipinellis 7be6b8ca73 Move gitlab-ssl nginx config from gitlab-recipes 2014-06-05 16:54:50 +03:00
Jeroen van Baarsen 793955cdfc We need to change config in step 5 2014-06-04 23:04:44 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets bd7c3955b1 Merge pull request #6882 from Tandrial/master 
Satellites access fix
 2014-05-30 16:59:02 +03:00
Sytse Sijbrandij c183019ce1 Merge branch 'use_newer_git_version' into 'master' 
Use newer git version

Fixes #1272
 2014-05-28 11:01:55 +00:00
Marin Jankovski 82855e078f Keep the lowest requirement for git in the documentation. 2014-05-28 12:53:10 +02:00
Marin Jankovski f22c709539 Add titles to doc pages. 2014-05-27 14:12:15 +02:00
Marin Jankovski e101369994 Use newer version of git in installation doc. 2014-05-27 13:06:20 +02:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Dmitriy Zaporozhets 5d77088202 Do gitlab:shell setup before seeds because we need /home/git/repositories exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 12:00:23 +03:00
dosire 126eefc5b8 Ruby version updated so it doesn't have the readline bug https://www.ruby-lang.org/en/news/2014/05/09/ruby-2-0-0-p481-is-released/. 2014-05-19 14:45:55 +02:00
Marin Jankovski 39d95b1d94 Update installation guide, create update guide. 2014-05-19 12:30:30 +02:00
Marin Jankovski dbd88d453b Update the examples to example.com 2014-05-16 12:57:32 +02:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00
dosire 049b63473f Link to the installation doc so people viewing on other locations can click the link. 2014-05-09 19:34:25 +02:00
Dmitriy Zaporozhets dd3a55064e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-07 14:57:26 +03:00
Ahmed Shafeeq 14102fd211 Remove extra "Compile assets" section 2014-05-07 01:14:00 +08:00
Dmitriy Zaporozhets a94b06e7b5 Merge branch 'postgres_fix' into 'master' 
Postgres fix. Closes #175
 2014-05-06 15:20:26 +00:00
Ahmed Shafeeq 536b2f2f75 Use production for Gitlab shell installation 2014-05-06 22:02:21 +08:00
Dmitriy Zaporozhets c883660a3e Fix install docs for gitlab-shell setup rake task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 13:46:15 +03:00
Dmitriy Zaporozhets 85b5d203ac Merge branch 'improve-gitlab-shell-installation' of https://github.com/pkgr/gitlabhq into pkgr-improve-gitlab-shell-installation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/install/installation.md
 2014-05-02 13:30:26 +03:00
Michael Krane a5e20638c2 Satellites access fix 2014-04-27 11:36:45 +02:00
Dmitriy Zaporozhets 31e804f887 Merge branch '6-8-stable' of dev.gitlab.org:gitlab/gitlabhq into ce-6-8-1 
Conflicts:
	VERSION
 2014-04-24 08:36:49 +02:00
Achilleas Pipinellis d1648a6a21 Ensure git user can create the database. Fix #175 2014-04-23 21:58:58 +03:00
Marin Jankovski 19438af8d1 Update installation guide with new shell version. 2014-04-22 12:23:57 +02:00
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
Evgeniy Sokovikov bc732a89be fix installation.md type 
depency -> dependency
 2014-04-18 14:35:38 +04:00
Job van der Voort 00b576e67d update version in installation doc 2014-04-17 09:42:08 +02:00