Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2014-11-27 | 1 | -0/+3 |
|\ | |||||
| * | add details on protected branches | Ben Bodenmiller | 2014-11-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Add some details from https://about.gitlab.com/2014/11/26/keeping-your-code-protected/: Who can: * Force push to non-protected branches * Force push to protected branches * Remove protected branches | ||||
* | | remove unnecessarry image | Marc Radulescu | 2014-11-27 | 2 | -1/+1 |
| | | |||||
* | | replaced hotlink | Marc Radulescu | 2014-11-26 | 2 | -1/+1 |
| | | |||||
* | | added office analogy to help understanding of gitlab architecture | Marc Radulescu | 2014-11-26 | 1 | -0/+32 |
| | | |||||
* | | Change it earlier as well. | Sytse Sijbrandij | 2014-11-26 | 1 | -1/+1 |
| | | |||||
* | | Selecting a branch is dangerous now that we have rc in a branch. | Sytse Sijbrandij | 2014-11-26 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'security-release-ownership' into 'master' | Marin Jankovski | 2014-11-24 | 3 | -1/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Explicitly mention patch releases | Jacob Vosmaer | 2014-11-24 | 1 | -1/+1 |
| | | |||||
| * | Establish ownership of security releases | Jacob Vosmaer | 2014-11-24 | 2 | -0/+3 |
| | | |||||
| * | The release manager handles all releases | Jacob Vosmaer | 2014-11-24 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Marin Jankovski | 2014-11-24 | 1 | -0/+4 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #8319 from bbodenmiller/patch-12 | Robert Schilling | 2014-11-23 | 1 | -0/+4 |
| |\ | | | | | | | start gitlab after mysql tweaks | ||||
| | * | start gitlab after mysql tweaks | Ben Bodenmiller | 2014-11-23 | 1 | -0/+4 |
| | | | |||||
* | | | More explicit wording of the documentation. | Sytse Sijbrandij | 2014-11-24 | 1 | -7/+7 |
| | | | |||||
* | | | Merge branch 'backup-cron-mode' into 'master' | Valery Sizov | 2014-11-24 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Add CRON=1 backup setting for quiet backups | Jacob Vosmaer | 2014-11-20 | 1 | -1/+4 |
| | | | |||||
* | | | Merge branch 'shell220' into 'master' | Jacob Vosmaer | 2014-11-20 | 1 | -5/+13 |
|\ \ \ | |/ / |/| | | | | | | | | | | | Add GitLab shell update to update guide See merge request !1269 | ||||
| * | | you have to update gitlab shell for gitlab 7.5 | Job van der Voort | 2014-11-20 | 1 | -5/+13 |
| | | | |||||
* | | | add correct path to rebuild-keys doc | Job van der Voort | 2014-11-20 | 1 | -1/+2 |
| | | | |||||
* | | | add rebuilding of authorized_keys to docs | Job van der Voort | 2014-11-20 | 1 | -0/+23 |
|/ / | |||||
* | | Small improvement to /api/user/keys doc | Daniel Serodio | 2014-11-18 | 1 | -3/+6 |
| | | | | | | | | The keys resource includes a create_at attribute | ||||
* | | Added update guide for updating to 7.5, and pointed installation and updates ↵ | Patricio Cano | 2014-11-17 | 3 | -19/+206 |
| | | | | | | | | guides to new version. | ||||
* | | Merge pull request #8310 from bbodenmiller/patch-3 | Robert Schilling | 2014-11-17 | 1 | -1/+1 |
|\ \ | | | | | | | fix backup rake task | ||||
| * | | fix backup rake task | Ben Bodenmiller | 2014-11-14 | 1 | -1/+1 |
| | | | |||||
* | | | remove extra cd command | Ben Bodenmiller | 2014-11-15 | 1 | -2/+0 |
| |/ |/| | |||||
* | | Merge branch 'gitlab.com-packages' into 'master' | Dmitriy Zaporozhets | 2014-11-14 | 1 | -1/+2 |
|\ \ | |/ |/| | | | | | | | Gitlab.com uses special packages, build them first See merge request !1255 | ||||
| * | Gitlab.com uses special packages, build them first | Jacob Vosmaer | 2014-11-14 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'actions_in_the_inbox' into 'master' | Dmitriy Zaporozhets | 2014-11-12 | 2 | -0/+11 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Actions in the inbox Related to #1607 See merge request !1247 | ||||
| * | | Add documentation about buttons in gmail. | Marin Jankovski | 2014-11-11 | 2 | -0/+11 |
| | | | |||||
* | | | Remove the lowest memory requirement of 512MB. | Marin Jankovski | 2014-11-12 | 1 | -6/+1 |
| | | | |||||
* | | | Merge pull request #8276 from dblessing/docs/custom_hooks | Dmitriy Zaporozhets | 2014-11-12 | 2 | -0/+42 |
|\ \ \ | | | | | | | | | Custom git hook documentation | ||||
| * | | | Custom git hook documentation | Drew Blessing | 2014-11-10 | 2 | -0/+42 |
| | |/ | |/| | |||||
* | | | Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into ↵ | Dmitriy Zaporozhets | 2014-11-12 | 1 | -0/+63 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeroenj/gitlab-ce-commit-comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| * | | | Adds comments to commits in the API | Jeroen Jacobs | 2014-09-26 | 1 | -0/+63 |
| | | | | |||||
* | | | | Sync master branch before releasing rc | Dmitriy Zaporozhets | 2014-11-11 | 1 | -0/+7 |
| |_|/ |/| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Add tip about EE and CE master synced before release rc1 | Dmitriy Zaporozhets | 2014-11-11 | 1 | -0/+2 |
| | | | |||||
* | | | Use release tools in patch release | Dmitriy Zaporozhets | 2014-11-11 | 1 | -4/+27 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Use release tool for monthly releases | Dmitriy Zaporozhets | 2014-11-11 | 1 | -62/+22 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'automate-upgrader-shell-version' into 'master' | Dmitriy Zaporozhets | 2014-11-11 | 1 | -7/+10 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | Automate upgrader shell version /cc @marin See merge request !1237 | ||||
| * | | Make GitLab Shell upgrade a natural part of the upgrade process. | Sytse Sijbrandij | 2014-11-02 | 1 | -7/+10 |
| | | | |||||
* | | | Merge pull request #7652 from m-a-r-c-o/logrotate-error-bugfix | Valeriy Sizov | 2014-11-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix log rotate permission error | ||||
| * | | | Change gitlab/log permissions in installation.md | Marco Cyriacks | 2014-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes default permission of the gitlab/log directory to u+rwX,go-w. This is done to make the directory NOT readable by group and others and to avoid logrotate complaining about it. chmod 755 is not used to avoid setting executable bit on file within the log dir. | ||||
* | | | | Merge pull request #7967 from Bugagazavr/issue-actor | Valeriy Sizov | 2014-11-05 | 1 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | Add issueable actor to hooks | ||||
| * | | | | Add issueable actor | Kirill Zaitsev | 2014-10-05 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Merge pull request #8196 from bbodenmiller/patch-12 | Valeriy Sizov | 2014-11-04 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | clarify that 'template1=#' is part of prompt | ||||
| * | | | | | clarify that 'template1=#' is part of prompt | Ben Bodenmiller | 2014-10-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | Similar to https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/database_mysql.md clarify that `template1=#` is part of the prompt. | ||||
* | | | | | | Merge pull request #8197 from bbodenmiller/patch-14 | Valeriy Sizov | 2014-11-04 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Quit the database session at end of database setup | ||||
| * | | | | | | Quit the database session at end of database setup | Ben Bodenmiller | 2014-10-30 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #8224 from liammonahan/master | Valeriy Sizov | 2014-11-04 | 1 | -3/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Expose projects_limit through users API if UserFull. |