home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,749 Commits 48 Branches 340 Tags
d3bf5f63f459a89c19d40e1becbba0d657127ebc
Commit Graph
324 Commits
Author SHA1 Message Date
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
Jacob Vosmaer b040078974 Clear changes to schema.rb when upgrading 
Having local changes is quite common and it is a stumbling block when
upgrading GitLab. Because schema.rb is generated from the actual DB
schema it is OK to clear the local changes.
 2014-10-01 10:41:20 +02:00
Marin Jankovski 2ac1f95ba1 Update guides to use gitlab-shell 2.0.1. 2014-10-01 09:56:04 +02:00
Sytse Sijbrandij b80e81eb28 Rename the speed upgrade file. 2014-09-30 10:29:11 +02:00
Sytse Sijbrandij 63033faa3a Remove notice that it hasn't been released yet. 2014-09-30 10:28:30 +02:00
Jacob Vosmaer 8f0551de05 Merge branch 'master' into 'master' 
Small documentation update, add unixsocketperm

If you run gitlab as user ``git`` while redis runs as user ``redis`` and you add git to ``redis`` group, you'll need to set ``unixsocketperm = 0775`` to grant write access to group.

See merge request !192
 2014-09-25 15:48:45 +00:00
Daniel Widerin 99e5e6db73 Remove obsolete line 2014-09-25 15:34:11 +00:00
Daniel Widerin 16a6d2450b Use edit in place with sed instead of tee 2014-09-25 15:24:56 +00:00
Daniel Widerin d5dc171cb7 Path on ubuntu is different 2014-09-25 15:23:40 +00:00
Daniel Widerin b874cb21eb Use 'sed' with pre-search to enable only if present in redis config file. 2014-09-25 15:23:06 +00:00
Daniel Widerin 18adc4f67d Fix 'Invalid socket file permissions' error 2014-09-25 11:09:46 +00:00
Jacob Vosmaer b268fa0595 Fix the sed command for increasing the backlog 2014-09-25 09:34:29 +02:00
Daniel Widerin d3dbd353cc Add unixsocketperm note to upgrade guide 2014-09-24 10:48:33 +00:00
Sytse Sijbrandij 0241efba59 Use origin to compare so it is not dependent on checking out the branch before. 2014-09-23 08:40:46 +02:00
Marin Jankovski 95aef84509 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-09-22 18:11:43 +02:00
Marin Jankovski 441237eea5 Update doc that 7.3 is released. 2014-09-22 18:09: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
Marin Jankovski 560c41ccf2 Merge pull request #7812 from bbodenmiller/7.3-upgrade 
improve 7.3 upgrade process & redis setup
 2014-09-22 09:59:03 +02:00
Marin Jankovski 8446f37e7c Merge pull request #7809 from bbodenmiller/patch-25 
update gitlab shell to 1.9.8 for gitlab 7.2.2
 2014-09-22 09:57:38 +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
Ben Bodenmiller 244513568c formatting improvements to upgrade guides 2014-09-21 04:28:47 -07:00
Ben Bodenmiller 9cf77b6604 update gitlab shell to 1.9.8 for gitlab 7.2.2 
As committed in https://github.com/gitlabhq/gitlabhq/commit/873acfd9aa54e801d5786c32b05c4f8ad21af72a GitLab 7.2.2 requires GitLab Shell 1.9.8. Fixes https://github.com/gitlabhq/gitlabhq/issues/7806.
 2014-09-21 03:47:24 -07:00
Marin Jankovski df3ea809f8 Add 7.3 update from ce to ee doc. 2014-09-18 10:01:14 +02:00
Ben Bodenmiller 28ee311d0c remove rack attack middleware update 
Hasn't changed since 7.2 release: https://github.com/gitlabhq/gitlabhq/commits/master/config/initializers/rack_attack.rb.example
 2014-09-17 20:01:25 -07: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
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
Jacob Vosmaer 5704e6fee9 Use sockets to connect to Redis 2014-09-12 14:59:58 +02:00
William Herry 276ee45487 add bunder step to mysql_to_postgresql doc 2014-09-10 05:55:45 +08:00
Sytse Sijbrandij bef923055b Merge pull request #7583 from bbodenmiller/https 
[Documentation] simplify HTTPS setup details
 2014-09-08 11:05:19 +02:00
Robert Schilling 5d543eb15e Merge pull request #7668 from bbodenmiller/patch-15 
add cleanup section to 5.0 upgrade guide
 2014-09-08 10:29:07 +02:00
Ben Bodenmiller 9a1dcf8d21 add cleanup section to 5.0 upgrade guide 
Add cleanup details to upgrade guide as gitolite and more is no longer
used
 2014-09-08 01:21:21 -07: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
Robert Schilling f074a09e4d Merge pull request #7665 from bbodenmiller/rm-chmod 
remove unnecessary chmod
 2014-09-02 08:59:21 +02:00
Robert Schilling f7235c5330 Merge pull request #7586 from bbodenmiller/patch-12 
[Documentation] simplify 6.0 to 7.2 upgrade guide
 2014-09-02 08:58:37 +02:00
Ben Bodenmiller 7681f8b0f7 simplify 6.0 to 7.2 upgrade guide 2014-09-01 16:41:37 -07:00
Ben Bodenmiller 60e24f4973 remove unnecessary chmod 
`lib/support/init.d/gitlab` was set as executable in the repo as of the
6.1 release so chmod is not needed after that. See
https://github.com/gitlabhq/gitlabhq/pull/7586/files#r16885445.
 2014-09-01 16:39:56 -07:00
Jeroen van Baarsen 174c00cf2c Merge pull request #7428 from bbodenmiller/patch-2 
[Documentation] add prepare for update details to 5.1 to 6.0 guide
 2014-08-31 10:46:50 +02:00
Ben Bodenmiller 44185ace11 add prepare for upgrade section 
helps detect and correct issues that may occur during upgrade before
they have already occurred. easier to address issues before you start
upgrade process.
 2014-08-30 17:04:45 -07:00
Robert Schilling 1646009724 Add pkg-config as required dependency for rugged 2014-08-26 06:10:53 +02:00
Dmitriy Zaporozhets 9b1bef54de Merge branch 'import_postgres_user' into 'master' 
Import the database as the `git` user

See merge request !762
 2014-08-23 20:44:54 +00:00
Robert Schilling 9bdd30f422 Remove outdated 6.0 to 7.1 update guide 2014-08-23 12:16:18 +02:00
Robert Schilling 33431c3e7d Merge pull request #7585 from bbodenmiller/patch-11 
clarify which configs should be updated
 2014-08-23 10:52:04 +02:00
Ben Bodenmiller aef3a5bf41 clarify which configs should be updated 2014-08-23 01:43:26 -07:00
Ben Bodenmiller 668e8aacfb remove prerelease note from 6.0 to 7.2 guide 2014-08-23 01:13:22 -07:00
Job van der Voort 230c52f76a update upgrader documentation to mention dependencies 2014-08-22 16:33:36 +02:00
Jacob Vosmaer 6ea702db9a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-08-22 10:00:26 +02:00