Commit Graph
1658 Commits
Author SHA1 Message Date
Marin Jankovski 8a0abbb757 Merge branch 'security-release-ownership' into 'master'
Security release ownership

We saw the following problems around the 7.4.4 release:

- the fix got merged into master while it should have been held back
- there was a security fix but no release manager to release it

With this change we want to improve our process and documentation
to prevent situations like this in the future.

See merge request !1273
2014-11-24 15:59:09 +00:00
Marin Jankovski e7a3e35572 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-24 16:57:48 +01:00
Jacob Vosmaer a0a3eba197 Explicitly mention patch releases 2014-11-24 14:59:54 +01:00
Jacob Vosmaer 4e3bf439cb Establish ownership of security releases 2014-11-24 12:14:19 +01:00
Jacob Vosmaer e0c870c045 The release manager handles all releases 2014-11-24 12:14:07 +01:00
Sytse Sijbrandij f4038138fb More explicit wording of the documentation. 2014-11-24 11:30:07 +01:00
Valery Sizov 5f7574cf05 Merge branch 'backup-cron-mode' into 'master'
Backup cron mode

If you have your server configured to receive emails containing the output of
cron jobs it is annoying to get long spammy emails from the backup script. This
change adds a 'cron mode' that makes the backup script silent unless something
goes wrong during the backup.

See merge request !1268
2014-11-24 09:33:39 +00:00
Robert Schilling 5f65310fcd Merge pull request #8319 from bbodenmiller/patch-12
start gitlab after mysql tweaks
2014-11-23 18:37:09 +01:00
Ben Bodenmiller 44e53aefd4 start gitlab after mysql tweaks 2014-11-23 02:28:34 -08:00
Ben Bodenmiller 762d8d3271 add details on backing up your SSH host keys
Users need to backup SSH host keys if they want to do a complete restore
to the same domain and not have users get the `WARNING: REMOTE HOST
IDENTIFICATION HAS CHANGED!` message.
2014-11-23 02:14:29 -08:00
Ben Bodenmiller 80db117a33 add preliminary 7.6 upgrade guide
Add preliminary 7.6 upgrade guide. Makes it easier to add upgrades as changes are made rather than trying to round up everything at RC1.

Initial additions:
* Nginx changes needed again in 7.6 as they did not make the final 7.5 upgrade guide
* Suggest that user sets time zone (added in https://github.com/gitlabhq/gitlabhq/pull/8015 but missed in final 7.5 upgrade guide)

Replaces https://github.com/gitlabhq/gitlabhq/pull/8124
2014-11-23 01:45:44 -08:00
Ben Bodenmiller e69db3ba5b update order of upgrade guide
GitLab needs to be stopped when backup is took.
2014-11-23 01:11:06 -08:00
Ben Bodenmiller 7cfaf890cb remove extra upgrade details, add missing config
Update 7.5 update guide:

* Remove unnecessary upgrade details (they were completed in 7.4 upgrade and only needed one time)
* Add missing Nginx config details
2014-11-23 01:08:29 -08:00
Jacob Vosmaer f68003560d The blog post will trigger a mail to the list 2014-11-21 09:59:46 +01:00
Ben Bodenmiller 4a39b6d9f7 add missing password prompt to mysqldump 2014-11-20 08:15:58 -08:00
Jacob Vosmaer 1b34a24ffd Merge branch 'shell220' into 'master'
Add GitLab shell update to update guide

See merge request !1269
2014-11-20 15:31:10 +00:00
Job van der Voort 2e0bbe68cb you have to update gitlab shell for gitlab 7.5 2014-11-20 15:58:03 +01:00
Jacob Vosmaer 7c54c63ac1 Add CRON=1 backup setting for quiet backups 2014-11-20 15:46:04 +01:00
Job van der Voort a72a919ae5 add correct path to rebuild-keys doc 2014-11-20 12:22:46 +01:00
Job van der Voort c4fc734e78 add rebuilding of authorized_keys to docs 2014-11-20 12:18:28 +01:00
Daniel Serodio 1016acc609 Small improvement to /api/user/keys doc
The keys resource includes a create_at attribute
2014-11-18 10:59:04 -02:00
Patricio Cano da35baed65 Added update guide for updating to 7.5, and pointed installation and updates guides to new version. 2014-11-17 16:56:51 -05:00
Robert Schilling ee6da7eacd Merge pull request #8310 from bbodenmiller/patch-3
fix backup rake task
2014-11-17 01:05:48 +01:00
Ben Bodenmiller 5b5446bd76 remove extra cd command 2014-11-15 06:25:08 -08:00
Dmitriy Zaporozhets e53f9b4d69 Merge branch 'gitlab.com-packages' into 'master'
Gitlab.com uses special packages, build them first

See merge request !1255
2014-11-14 14:25:41 +00:00
Jacob Vosmaer de3bef058e Gitlab.com uses special packages, build them first 2014-11-14 11:47:08 +01:00
Ben Bodenmiller e0467e8f58 fix backup rake task 2014-11-14 02:41:58 -08:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master'
Actions in the inbox

Related to #1607

See merge request !1247
2014-11-12 14:57:38 +00:00
Marin Jankovski 5cf6d5949d Remove the lowest memory requirement of 512MB. 2014-11-12 12:54:43 +01:00
Dmitriy Zaporozhets 53f05343f5 Merge pull request #8276 from dblessing/docs/custom_hooks
Custom git hook documentation
2014-11-12 13:23:59 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-11-12 13:19:35 +02:00
Dmitriy Zaporozhets 116f73b540 Sync master branch before releasing rc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 18:48:39 +02:00
Marin Jankovski d65f2bad6c Add documentation about buttons in gmail. 2014-11-11 16:30:14 +01:00
Dmitriy Zaporozhets a15dc7b814 Add tip about EE and CE master synced before release rc1 2014-11-11 10:22:05 +00:00
Dmitriy Zaporozhets 1d1b211642 Use release tools in patch release
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 12:01:47 +02:00
Dmitriy Zaporozhets 07cca8cc0c Use release tool for monthly releases
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 11:47:44 +02:00
Dmitriy Zaporozhets 868a08d14c Merge branch 'automate-upgrader-shell-version' into 'master'
Automate upgrader shell version

/cc @marin

See merge request !1237
2014-11-11 09:22:09 +00:00
Drew Blessing 667c0a909b Custom git hook documentation 2014-11-10 11:01:42 -06:00
Valeriy Sizov 46bd0a88dd Merge pull request #7652 from m-a-r-c-o/logrotate-error-bugfix
Fix log rotate permission error
2014-11-05 13:50:11 +02:00
Valeriy Sizov 5c6b21f1c2 Merge pull request #7967 from Bugagazavr/issue-actor
Add issueable actor to hooks
2014-11-05 12:10:50 +02:00
Valeriy Sizov ed68797672 Merge pull request #8196 from bbodenmiller/patch-12
clarify that 'template1=#' is part of prompt
2014-11-04 17:37:46 +02:00
Valeriy Sizov f8981e02cd Merge pull request #8197 from bbodenmiller/patch-14
Quit the database session at end of database setup
2014-11-04 17:34:30 +02:00
Valeriy Sizov 24276ed836 Merge pull request #8224 from liammonahan/master
Expose projects_limit through users API if UserFull.
2014-11-04 17:33:20 +02:00
Dmitriy Zaporozhets d7c50b4a95 Merge branch 'api-events-username' into 'master'
Expose author username in project events API

Fixes gitlab/gitlabhq#1476

See merge request !1236
2014-11-03 11:52:33 +00:00
Marin Jankovski fe610ff576 Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url
update slack-notifier for new webhook_url format
2014-11-03 09:57:05 +01:00
Liam Monahan 2edf212a8b Expose projects_limit through users API if UserFull. 2014-11-02 18:51:34 -05:00
Sytse Sijbrandij bc0cf74589 Make GitLab Shell upgrade a natural part of the upgrade process. 2014-11-02 15:13:30 -08:00
Robert Schilling 4d23e840d3 Merge pull request #8209 from naveda89/patch-1
Fixed markdown error in 7.3-to-7.4 update guide
2014-11-02 10:08:03 +01:00
Ciro Santilli 884e916fe2 Fix doc rake import md style [ci-skip] 2014-10-31 12:51:53 +01:00
Alvaro Naveda 76e3b8c659 Fixed markdown error in 7.3-to-7.4 update guide
Just fixed a minor bug in the markdown notation
2014-10-31 11:55:56 +01:00