Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release/7.5.3' into '7-5-stable' | Jacob Vosmaer | 2014-12-05 | 3 | -7/+10 |
|\ | | | | | | | | | | | Fixes for 7.5.3 See merge request !1302 | ||||
| * | Update CHANGELOG for 7.5.3 | Jacob Vosmaer | 2014-12-05 | 1 | -2/+5 |
| | | |||||
| * | Revert "Update Sidekiq to 2.17.8" | Jacob Vosmaer | 2014-12-05 | 3 | -16/+13 |
| | | | | | | | | This reverts commit 91ee82c54f41d830922f5504ea37a8a75a0c360b. | ||||
| * | Bump gitlab_git with new rugged | Dmitriy Zaporozhets | 2014-12-04 | 2 | -5/+5 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Update Sidekiq to 2.17.8 | Jacob Vosmaer | 2014-12-04 | 3 | -13/+16 |
|/ | | | | | Conflicts: CHANGELOG | ||||
* | Version 7.5.2v7.5.2 | Jacob Vosmaer | 2014-12-02 | 1 | -1/+1 |
| | |||||
* | Merge branch 'release/7.5.2' into '7-5-stable' | Jacob Vosmaer | 2014-12-02 | 5 | -2/+30 |
|\ | | | | | | | | | | | Fixes for 7.5.2 See merge request !1283 | ||||
| * | Add wiki restore fix to CHANGELOG | Jacob Vosmaer | 2014-12-01 | 1 | -0/+1 |
| | | |||||
| * | Remove unnecessary backported change | Jacob Vosmaer | 2014-12-01 | 1 | -1/+1 |
| | | | | | | | | Make the diff with 7.5.1 smaller. | ||||
| * | Properly fix wiki restore. | Achilleas Pipinellis | 2014-12-01 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | ProjectWiki.new() creates a new wiki git repository, so any tries to bare clone a bundle fail. With this patch we remove the newly created wiki.git before restoring from the backup bundle. Conflicts: lib/backup/repository.rb | ||||
| * | Disable Sidekiq arguments logging by default | Jacob Vosmaer | 2014-12-01 | 4 | -1/+20 |
|/ | | | | | Conflicts: config/initializers/4_sidekiq.rb | ||||
* | Version 7.5.1v7.5.1 | Jacob Vosmaer | 2014-11-21 | 1 | -1/+1 |
| | |||||
* | Add missing timestamps to the 'members' table | Jacob Vosmaer | 2014-11-21 | 3 | -1/+19 |
| | |||||
* | Version 7.5.0v7.5.0 | Jacob Vosmaer | 2014-11-21 | 1 | -1/+1 |
| | |||||
* | Added update guide for updating to 7.5, and pointed installation and updates ↵ | Patricio Cano | 2014-11-18 | 3 | -19/+206 |
| | | | | guides to new version. | ||||
* | Version 7.5.0.rc1v7.5.0.rc1 | Jacob Vosmaer | 2014-11-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'update_changelog_' into 'master' | Valery Sizov | 2014-11-17 | 1 | -1/+2 |
|\ | | | | | | | | | | | Update changelog See merge request !1258 | ||||
| * | Update changelog | Valery Sizov | 2014-11-17 | 1 | -1/+2 |
|/ | |||||
* | Merge branch 'sidekiq_gc_start' into 'master' | Dmitriy Zaporozhets | 2014-11-14 | 2 | -0/+4 |
|\ | | | | | | | | | | | | | | | Run 'GC.start' after every EmailsOnPushWorker job This change removed a lot of large peaks of the Sidekiq memory growth graph on gitlab.com. See merge request !1257 | ||||
| * | Run 'GC.start' after every EmailsOnPushWorker job | Jacob Vosmaer | 2014-11-14 | 2 | -0/+4 |
| | | |||||
* | | Merge branch 'update-gitlab-git' into 'master' | Dmitriy Zaporozhets | 2014-11-14 | 2 | -3/+3 |
|\ \ | | | | | | | | | | | | | | | | Update gitlab_git to 7.0.0.rc11 See merge request !1256 | ||||
| * | | Update gitlab_git to 7.0.0.rc11 | Jacob Vosmaer | 2014-11-14 | 2 | -3/+3 |
| |/ | |||||
* | | 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 'author_attributes_clean' into 'master' | Dmitriy Zaporozhets | 2014-11-14 | 1 | -2/+6 |
|\ \ | | | | | | | | | | | | | | | | Author attributes clean See merge request !1254 | ||||
| * | | Clean the string with commit author and email. | Marin Jankovski | 2014-11-14 | 1 | -2/+6 |
| | | | |||||
* | | | Merge branch 'branch_name' into 'master' | Dmitriy Zaporozhets | 2014-11-14 | 2 | -1/+55 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Strip tags from branch name See merge request !1251 | ||||
| * | | | Sanitize branch name and ref name | Marin Jankovski | 2014-11-13 | 1 | -1/+4 |
| | | | | |||||
| * | | | Add branch controller test. | Marin Jankovski | 2014-11-13 | 1 | -0/+51 |
| | | | | |||||
* | | | | Merge branch 'update-changelog' into 'master' | Dmitriy Zaporozhets | 2014-11-14 | 1 | -0/+11 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | Update changelog See merge request !1252 | ||||
| * | | | Update CHANGELOG for 7.5 | Dmitriy Zaporozhets | 2014-11-13 | 1 | -0/+11 |
|/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge pull request #8299 from dandric-activevideo/bug8271 | Jacob Vosmaer | 2014-11-13 | 1 | -1/+7 |
|\ \ \ | |/ / |/| | | Fix for #8271: Correctly restore empty repositories. | ||||
| * | | Correctly restore empty repositories. | Dimitry Andric | 2014-11-13 | 1 | -1/+7 |
|/ / | | | | | | | | | | | If a project is being restored, but there is no bundle file, the project was empty when it was backed up. In this case, just use git init --base to create a new bare repository. | ||||
* | | Merge branch 'actions_in_the_inbox' into 'master' | Dmitriy Zaporozhets | 2014-11-12 | 5 | -0/+45 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Actions in the inbox Related to #1607 See merge request !1247 | ||||
| * | | Set action on issue/mr creation mail. | Marin Jankovski | 2014-11-12 | 2 | -12/+24 |
| | | | |||||
| * | | Add documentation about buttons in gmail. | Marin Jankovski | 2014-11-11 | 2 | -0/+11 |
| | | | |||||
| * | | Include the helper for mailer, add links to emails. | Marin Jankovski | 2014-11-11 | 2 | -0/+2 |
| | | | |||||
| * | | Create emails helper for actions links. | Marin Jankovski | 2014-11-11 | 1 | -0/+20 |
| | | | |||||
* | | | Merge branch 'requirements_update' into 'master' | Dmitriy Zaporozhets | 2014-11-12 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RAM Requirements update 512MB of RAM is not enough to install using omnibus-gitlab. Installation will fail in very random places. Manual installation might also fail with this low amount of RAM. See merge request !1249 | ||||
| * | | | Remove the lowest memory requirement of 512MB. | Marin Jankovski | 2014-11-12 | 1 | -6/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-11-12 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task | Jacob Vosmaer | 2014-11-12 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | fixes the `block_removed_ldap_users` rake task | ||||
| | * | | | fixes the `block_removed_ldap_users` rake task | Marvin Frick | 2014-11-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In e23a26a (and later 1bc9936) the API for Gitlab::LDAP::Adapter was changed. I assume this rake task was an oversight in the refactoring of the changed class. While being on it, I noticed that already blocked users cannot be blocked again. | ||||
* | | | | | Merge branch 'performance-improvements' into 'master' | Dmitriy Zaporozhets | 2014-11-12 | 1 | -4/+14 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements Push 1k commits cause 1k sql queries to collect commit author. But this variable was used only in 20 commits (from 1000). So we did 980 sql queries without using it. This MR fixes it. See merge request !1250 | ||||
| * | | | | Prevent big amount of sql queries for push service | Dmitriy Zaporozhets | 2014-11-12 | 1 | -4/+14 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | 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 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-11-12 | 3 | -0/+12 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'backup_restore_drop_sequences' into 'master' | Valery Sizov | 2014-11-12 | 3 | -0/+12 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Drop all Postgres sequences during backup restore See merge request !1226 | ||||
| | * | | | | Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences | Valery Sizov | 2014-11-12 | 108 | -456/+735 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: CHANGELOG |