summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.5.3v7.5.37-5-stableJacob Vosmaer2014-12-051-1/+1
|
* Merge branch 'release/7.5.3' into '7-5-stable'Jacob Vosmaer2014-12-053-7/+10
|\ | | | | | | | | | | Fixes for 7.5.3 See merge request !1302
| * Update CHANGELOG for 7.5.3Jacob Vosmaer2014-12-051-2/+5
| |
| * Revert "Update Sidekiq to 2.17.8"Jacob Vosmaer2014-12-053-16/+13
| | | | | | | | This reverts commit 91ee82c54f41d830922f5504ea37a8a75a0c360b.
| * Bump gitlab_git with new ruggedDmitriy Zaporozhets2014-12-042-5/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update Sidekiq to 2.17.8Jacob Vosmaer2014-12-043-13/+16
|/ | | | | Conflicts: CHANGELOG
* Version 7.5.2v7.5.2Jacob Vosmaer2014-12-021-1/+1
|
* Merge branch 'release/7.5.2' into '7-5-stable'Jacob Vosmaer2014-12-025-2/+30
|\ | | | | | | | | | | Fixes for 7.5.2 See merge request !1283
| * Add wiki restore fix to CHANGELOGJacob Vosmaer2014-12-011-0/+1
| |
| * Remove unnecessary backported changeJacob Vosmaer2014-12-011-1/+1
| | | | | | | | Make the diff with 7.5.1 smaller.
| * Properly fix wiki restore.Achilleas Pipinellis2014-12-011-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 defaultJacob Vosmaer2014-12-014-1/+20
|/ | | | | Conflicts: config/initializers/4_sidekiq.rb
* Version 7.5.1v7.5.1Jacob Vosmaer2014-11-211-1/+1
|
* Add missing timestamps to the 'members' tableJacob Vosmaer2014-11-213-1/+19
|
* Version 7.5.0v7.5.0Jacob Vosmaer2014-11-211-1/+1
|
* Added update guide for updating to 7.5, and pointed installation and updates ↵Patricio Cano2014-11-183-19/+206
| | | | guides to new version.
* Version 7.5.0.rc1v7.5.0.rc1Jacob Vosmaer2014-11-171-1/+1
|
* Merge branch 'update_changelog_' into 'master'Valery Sizov2014-11-171-1/+2
|\ | | | | | | | | | | Update changelog See merge request !1258
| * Update changelogValery Sizov2014-11-171-1/+2
|/
* Merge branch 'sidekiq_gc_start' into 'master'Dmitriy Zaporozhets2014-11-142-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 jobJacob Vosmaer2014-11-142-0/+4
| |
* | Merge branch 'update-gitlab-git' into 'master'Dmitriy Zaporozhets2014-11-142-3/+3
|\ \ | | | | | | | | | | | | | | | Update gitlab_git to 7.0.0.rc11 See merge request !1256
| * | Update gitlab_git to 7.0.0.rc11Jacob Vosmaer2014-11-142-3/+3
| |/
* | Merge branch 'gitlab.com-packages' into 'master'Dmitriy Zaporozhets2014-11-141-1/+2
|\ \ | | | | | | | | | | | | | | | Gitlab.com uses special packages, build them first See merge request !1255
| * | Gitlab.com uses special packages, build them firstJacob Vosmaer2014-11-141-1/+2
| |/
* | Merge branch 'author_attributes_clean' into 'master'Dmitriy Zaporozhets2014-11-141-2/+6
|\ \ | | | | | | | | | | | | | | | Author attributes clean See merge request !1254
| * | Clean the string with commit author and email.Marin Jankovski2014-11-141-2/+6
| | |
* | | Merge branch 'branch_name' into 'master'Dmitriy Zaporozhets2014-11-142-1/+55
|\ \ \ | | | | | | | | | | | | | | | | | | | | Strip tags from branch name See merge request !1251
| * | | Sanitize branch name and ref nameMarin Jankovski2014-11-131-1/+4
| | | |
| * | | Add branch controller test.Marin Jankovski2014-11-131-0/+51
| | | |
* | | | Merge branch 'update-changelog' into 'master'Dmitriy Zaporozhets2014-11-141-0/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Update changelog See merge request !1252
| * | | Update CHANGELOG for 7.5Dmitriy Zaporozhets2014-11-131-0/+11
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #8299 from dandric-activevideo/bug8271Jacob Vosmaer2014-11-131-1/+7
|\ \ \ | |/ / |/| | Fix for #8271: Correctly restore empty repositories.
| * | Correctly restore empty repositories.Dimitry Andric2014-11-131-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 Zaporozhets2014-11-125-0/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | Actions in the inbox Related to #1607 See merge request !1247
| * | Set action on issue/mr creation mail.Marin Jankovski2014-11-122-12/+24
| | |
| * | Add documentation about buttons in gmail.Marin Jankovski2014-11-112-0/+11
| | |
| * | Include the helper for mailer, add links to emails.Marin Jankovski2014-11-112-0/+2
| | |
| * | Create emails helper for actions links.Marin Jankovski2014-11-111-0/+20
| | |
* | | Merge branch 'requirements_update' into 'master'Dmitriy Zaporozhets2014-11-121-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 Jankovski2014-11-121-6/+1
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-11-121-2/+2
|\ \ \ \
| * \ \ \ Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_taskJacob Vosmaer2014-11-121-2/+2
| |\ \ \ \ | | |/ / / | |/| | | fixes the `block_removed_ldap_users` rake task
| | * | | fixes the `block_removed_ldap_users` rake taskMarvin Frick2014-11-121-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 Zaporozhets2014-11-121-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 serviceDmitriy Zaporozhets2014-11-121-4/+14
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #8276 from dblessing/docs/custom_hooksDmitriy Zaporozhets2014-11-122-0/+42
|\ \ \ \ | | | | | | | | | | Custom git hook documentation
| * | | | Custom git hook documentationDrew Blessing2014-11-102-0/+42
| | | | |
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-11-123-0/+12
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backup_restore_drop_sequences' into 'master'Valery Sizov2014-11-123-0/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Drop all Postgres sequences during backup restore See merge request !1226