Commit Graph
1381 Commits
Author SHA1 Message Date
Marin Jankovski 2ac1f95ba1 Update guides to use gitlab-shell 2.0.1. 2014-10-01 09:56:04 +02:00
Marin Jankovski ff2b0bfabd Merge branch 'speed-upgrade' into 'master'
Speed upgrade

/cc @jacobvosmaer @dzaporozhets

See merge request !1134
2014-09-30 10:20:18 +00:00
Jacob Vosmaer b5d2d3d799 Consolidate the IAM backup upload policy 2014-09-30 12:03:44 +02:00
Jacob Vosmaer 794078a32a Add a 'region' to the backup upload connection 2014-09-30 12:03:36 +02:00
Dmitriy Zaporozhets 4c52ff5184 Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-09-30 12:17:57 +03: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
Dmitriy Zaporozhets 9654cbb592 Merge branch 'backup-uploader'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-09-29 18:20:21 +03:00
Job van der Voort 17ad28f3c6 resize large picture in git flow article 2014-09-29 16:13:02 +02:00
Job van der Voort 09352d1f04 add new images to gitflow article and space them 2014-09-29 16:10:32 +02:00
Sytse Sijbrandij 15f01b6a85 Merge branch 'gitlab-flow' of gitlab.com:gitlab-org/gitlab-ce into gitlab-flow 2014-09-29 15:30:17 +02:00
Sytse Sijbrandij 4df15fe33e Merge branch 'master' into gitlab-flow
Conflicts:
	CONTRIBUTING.md
2014-09-29 15:21:34 +02:00
Jacob Vosmaer e1f6fa6f18 Add backup upload support to the rake task 2014-09-29 15:03:08 +02:00
Job van der Voort 5121fce196 update ci mr image with smaller screenshots 2014-09-29 13:38:43 +02:00
Job van der Voort 8b17bdaafc capitalize omnibus in docs 2014-09-29 12:55:15 +02:00
Job van der Voort 05b3202855 use omnibus package to refer to omnibus gitlab at all times to avoid confusion 2014-09-28 22:56:47 +02:00
Job van der Voort 841fc4d95e add screenshots to gitlab-flow article 2014-09-28 15:47:53 +02:00
Job van der Voort 0f35c61dc0 add graphs to git-flow article 2014-09-28 13:59:33 +02:00
Ciro Santilli 862315dcb0 Typo indiciated -> indicated. 2014-09-27 10:34:51 +02:00
jubianchi f258a59ef6 Filters issues by milestone via API 2014-09-26 22:03:37 +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
Dmitriy Zaporozhets 868755777f Merge branch 'add-bugzilla' into 'master'
Add bugzilla

See merge request !1114
2014-09-25 13:59:24 +00:00
Daniel Widerin 18adc4f67d Fix 'Invalid socket file permissions' error 2014-09-25 11:09:46 +00:00
Jacob Vosmaer b0a4ec5ea2 Merge branch 'backup-time' into 'master'
Backup time

The suggested backup time conflicts with daylight savings time, which occurs between 1-3am, causing the backup either to be skipped or ran twice.

See merge request !1118
2014-09-25 07:52:23 +00:00
Jacob Vosmaer 9cd5ff043a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-25 09:50:19 +02:00
Job van der Voort 4ed5a506be set the proposed backup time to 4am 2014-09-25 09:38:17 +02:00
Jacob Vosmaer b268fa0595 Fix the sed command for increasing the backlog 2014-09-25 09:34:29 +02:00
Achilleas Pipinellis 05b535e1c0 Add missing Redis item list in Overview [ci skip]. 2014-09-24 22:59:26 +03:00
Sytse Sijbrandij de717a3335 Merge branch 'gitlab_ldap_filter' into 'master'
Add more LDAP user_filter documentation

See merge request !1115
2014-09-24 12:06:47 +00:00
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +02:00
Daniel Widerin d3dbd353cc Add unixsocketperm note to upgrade guide 2014-09-24 10:48:33 +00:00
Sytse Sijbrandij 41cfdd25e2 Add bugzilla to list because people ask about it. 2014-09-24 11:50:00 +02:00
Dmitriy Zaporozhets 4d5435410f Merge branch 'jubianchi-api/improve-error-reporting' into 'master'
Merge jubianchi-api/improve-error-reporting

Closes https://github.com/gitlabhq/gitlabhq/pull/7502

See merge request !1112
2014-09-24 09:25:55 +00:00
Sytse Sijbrandij 8d7ed7e53b Add notice about weekend in release cycle. 2014-09-24 08:42:45 +02:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Marin Jankovski 0f7cad07d0 Add to monthly doc that reverting a feature is an option. 2014-09-23 09:03:38 +02: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
Sytse Sijbrandij b3c53efc42 Merge branch 'monthly_release_document_update' into 'master'
Monthly release document update

See merge request !1092
2014-09-22 17:23:47 +00:00
Marin Jankovski 441237eea5 Update doc that 7.3 is released. 2014-09-22 18:09:49 +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 457caaae49 Update manual installation guide for the correct shell version. 2014-09-22 14:50:06 +02:00
Sytse Sijbrandij 6f61cbd162 Add wisdom about reverting a revert merge. 2014-09-22 13:10:13 +02:00