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
448 Commits
Author SHA1 Message Date
Valery Sizov f59b692420 Merge branch 'gitlab-ee/master' into 7-4-stable_ 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-10-17 20:35:51 +03:00
Valery Sizov 4da88dbb2d documents updated 2014-10-17 13:47:20 +03:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Sytse Sijbrandij e8e022daec Refer to the Omnibus installation from eveerywhere since people link to installation.md directly. 2014-10-15 16:29:05 +02: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
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about 
Replace www.gitlab.com with about.gitlab.com
 2014-10-08 09:46:51 +02:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Robert Schilling d790b2cbb8 Merge pull request #7975 from bbodenmiller/patch-4 
webbrowsers -> web browsers
 2014-10-06 19:31:15 +02:00
Ben Bodenmiller 014eeb2e0b webbrowsers -> web browsers 2014-10-06 09:27:38 -07:00
Ben Bodenmiller 897d69d6d5 number formatting fix 2014-10-06 09:26:40 -07:00
Marin Jankovski d3bf5f63f4 Updated packages for 7.2.0 and 7.2.1 for ubuntu and debian. 2014-10-03 15:43:33 +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
Marin Jankovski cb51407c54 Packages for 7.3.2-ee. 2014-10-01 14:03:12 +02:00
Marin Jankovski 2ac1f95ba1 Update guides to use gitlab-shell 2.0.1. 2014-10-01 09:56:04 +02:00
Ciro Santilli 862315dcb0 Typo indiciated -> indicated. 2014-09-27 10:34:51 +02:00
Achilleas Pipinellis 05b535e1c0 Add missing Redis item list in Overview [ci skip]. 2014-09-24 22:59:26 +03:00
Marin Jankovski 1d63d07307 Packages for 7.3.1-ee 2014-09-24 10:33:12 +02:00
Marin Jankovski fa333ecbaa Packages for 7.3.0-ee. 2014-09-22 16:23:49 +02:00
Marin Jankovski 716d6d9e90 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-09-22 15:35:09 +02:00
Marin Jankovski 457caaae49 Update manual installation guide for the correct shell version. 2014-09-22 14:50:06 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Ben Bodenmiller 559af04f34 improve 7.3 upgrade process & redius setup 
Fixes
https://github.com/gitlabhq/gitlabhq/commit/2b35c887904b6a7a05a7c88fdf1ccd66ba943e20#commitcomment-7829537,
https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829367,
&
https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829381
 2014-09-21 05:05:48 -07:00
Marin Jankovski 9531e59273 Update md5 of centos7 package. 2014-09-19 12:59:46 +02:00
Marin Jankovski 2208968b91 Add 7.2.2-ee packages. 2014-09-19 11:45:00 +02:00
Tobias Pfeiffer 0311efcbf0 Delete stray brace 
* seems like a small mistake ;-)
 2014-09-18 18:39:30 +02:00
Marin Jankovski 36a9e47d70 Merge remote-tracking branch 'CE/master' into merge_ce_rc1 
Conflicts:
	Gemfile.lock
	VERSION
	doc/README.md
	doc/install/installation.md
 2014-09-17 18:36:14 +02:00
Marin Jankovski 2b35c88790 Updates to the update/install docs for 7.3.rc1 2014-09-17 18:27:23 +02:00
Marin Jankovski 2ad6789216 Merge remote-tracking branch 'CE/master' into merge_ce_7_3_to_ee 2014-09-16 12:55:21 +02:00
Dmitriy Zaporozhets 892371bc22 Merge branch 'redis_socket' into 'master' 
Use sockets to connect to Redis

See merge request !1088
 2014-09-15 14:49:02 +00: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
Robert Schilling 5ac019946f Merge pull request #7743 from bbodenmiller/patch-12 
formatting changes, table->database
 2014-09-12 18:43:28 +02:00
Jacob Vosmaer 5704e6fee9 Use sockets to connect to Redis 2014-09-12 14:59:58 +02:00
Robert Schilling a6084a7608 Merge pull request #7439 from bbodenmiller/patch-6 
set the number of workers to # of cores
 2014-09-12 11:37:54 +02:00
Ben Bodenmiller ee6ec5bd6d set the number of workers to # of cores 2014-09-12 02:22:43 -07:00
Ben Bodenmiller 377a5bd521 formatting changes, table->database 
Make formatting consistent on page.

Change table -> database as they are database permissions.
 2014-09-12 01:03:11 -07:00
Ben Bodenmiller 7a6857adfb update grant command to match how mysql shows 
When looking up the granted permissions for users in MySQL using `show grants for 'git'@'localhost';` it shows the permissions in this order regardless of how you enter them. Changing so that comparing your actual permissions vs. what installation guide says is easier.
 2014-09-11 01:43:00 -07:00
Marin Jankovski 09e64ae605 Add an option to supply root password through an environmental variable. 2014-09-11 10:06:56 +02:00
Ben Bodenmiller 43f0efe5d3 cleanup MySQL doc wording 2014-09-10 17:23:06 -07:00
Ben Bodenmiller 083b153d45 fix formatting issue 
fix formatting issue with self-signed certificate section
 2014-09-09 10:43:28 -07:00
Marin Jankovski 67c956e16d Link the doc in installation document. 2014-09-08 15:30:10 +02:00
Marin Jankovski e59b3720e9 Move custom Omniauth directions to omniauth doc. 2014-09-08 12:27:11 +02:00
Sytse Sijbrandij 1aec74f374 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-08 11:06:00 +02:00
Ben Bodenmiller 5d5d4ef91a simplify HTTPS setup details 
also adds comment about updating nginx files during upgrades
 2014-09-07 15:31:13 -07:00
Sytse Sijbrandij 079c1685f2 Mention that people should use the CentOS tools. 2014-09-03 10:20:57 +02:00
Sytse Sijbrandij 68682dc1f8 Rename to prevent confusion with GitLab Enterprise Edition. 2014-09-03 10:13:40 +02:00
Ben Bodenmiller 46c3bbd78d gitlab->GitLab 2014-09-01 19:33:13 -07:00
Jacob Vosmaer a81d806b77 Fix version texts for latest packages 2014-08-28 18:13:32 +02:00
Jacob Vosmaer 0e8f10a728 Add packages for GitLab 7.2.1-ee 2014-08-28 17:23:48 +02:00
Jacob Vosmaer 8c6d8b9959 Add 7.2.0-ee packages for Centos 7 2014-08-27 15:07:30 +02:00
Robert Schilling 7c1e60f0b4 Do not specify postgres-version while installing 2014-08-27 09:16:33 +02:00