summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* bring more usability to issues filtering. Block issues area on loading ↵Dmitriy Zaporozhets2013-05-086-60/+670
| | | | filtered results
* init filter linksDmitriy Zaporozhets2013-05-082-4/+15
|
* replace selectboxes with filtersDmitriy Zaporozhets2013-05-083-5/+55
|
* Merge pull request #3862 from crazyscience/patch-3Dmitriy Zaporozhets2013-05-073-0/+7
|\ | | | | Setting the working directory before git operations
| * Setting the working directory before git operationscrazyscience2013-05-073-0/+7
| |
* | Merge pull request #3877 from mikehaertl/3793-puma-relative-urlDmitriy Zaporozhets2013-05-071-0/+4
|\ \ | | | | | | Puma configuration for relative base URL
| * | Fixes #3793: Puma configuration for relative base URLMichael Härtl2013-05-081-0/+4
|/ /
* | Merge pull request #3874 from axilleas/installation-fixDmitriy Zaporozhets2013-05-071-2/+2
|\ \ | | | | | | Bump charlock_holmes to 0.9.6.4
| * | Bump charlock_holmes to 0.9.6.4Axilleas Pipinellis2013-05-071-2/+2
|/ / | | | | | | Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-05-072-1/+5
|\ \
| * \ Merge pull request #3871 from axilleas/backup-fixDmitriy Zaporozhets2013-05-072-1/+5
| |\ \ | | | | | | | | Fix errors during backup task. Fix #3785
| | * | Fix errors during backup task. Fix #3785Axilleas Pipinellis2013-05-072-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default there is no public/uploads directory when no attachments are uploaded. Prompt users to create the uploads directory during install otherwise the backup task will fail. Place mysqldump args in single quotes to avoid error if password contains special characters. Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
* | | | Merge branch 'feature/labels_set' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-05-0711-30/+94
|\ \ \ \ | |/ / / |/| | |
| * | | fix api delete hook testDmitriy Zaporozhets2013-05-071-2/+2
| | | |
| * | | Include default labels in issues autocomplete etc. Show colored labels on ↵Dmitriy Zaporozhets2013-05-078-46/+53
| | | | | | | | | | | | | | | | issues show page
| * | | add Gitlab::Label class and different color labels for default labels setDmitriy Zaporozhets2013-05-073-1/+45
| | | |
| * | | Add generate action to labels controller which allow creation of default ↵Dmitriy Zaporozhets2013-05-073-4/+17
|/ / / | | | | | | | | | labels set for project
* | | Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashesDmitriy Zaporozhets2013-05-0746-303/+302
|\ \ \ | | | | | | | | Code cleanup: Replace old hashes and remove trailing spaces
| * | | Repair failed testAndrey Kumanyaev2013-05-051-1/+1
| | | |
| * | | remove trailing spacesAndrey Kumanyaev2013-05-0511-173/+173
| | | |
| * | | Replace old hashes with new 1.9 ruby hashes (rebase)Andrey Kumanyaev2013-05-0538-131/+130
| | | |
* | | | Merge pull request #3868 from hiroponz/fix_check_git_versionDmitriy Zaporozhets2013-05-071-4/+22
|\ \ \ \ | | | | | | | | | | Fix check git version.
| * | | | Fix check git version.Sato Hiroyuki2013-05-071-4/+22
| | |_|/ | |/| | | | | | | | | | Checking is "yes" only if git version equals "1.7.10" exactly.
* | | | Merge pull request #3866 from senny/maintenance_guidelinesDmitriy Zaporozhets2013-05-073-0/+27
|\ \ \ \ | | | | | | | | | | maintenance policy
| * | | | maintenance policy draftYves Senn2013-05-073-0/+27
| | | | |
* | | | | Merge pull request #3852 from axilleas/minitest-fixDmitriy Zaporozhets2013-05-072-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Add minitest to Gemfile. Fix #3826
| * | | | Add minitest to Gemfile. Fix #3826Axilleas Pipinellis2013-05-072-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | There are occasions where minitest is not bundled in packaged versions of ruby that some OSes distribute (eg Fedora). Adding minitest to Gemfile ensures that it gets loaded and tests can run. Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
* | | | Merge pull request #3856 from NARKOZ/delete-hook-apiDmitriy Zaporozhets2013-05-062-5/+5
|\ \ \ \ | | | | | | | | | | fix API route to delete project hook
| * | | | fix API route to delete project hookNihad Abbasov2013-05-072-5/+5
|/ / / /
* | | | Restyle admin -> groups pageDmitriy Zaporozhets2013-05-061-24/+35
| | | |
* | | | Style paginationDmitriy Zaporozhets2013-05-061-0/+6
| | | |
* | | | Usability improvements to deploy leysDmitriy Zaporozhets2013-05-062-1/+7
| | | |
* | | | Merge pull request #3847 from boldt/unicorn-to-pumaDmitriy Zaporozhets2013-05-061-1/+1
|\ \ \ \ | | | | | | | | | | Fixed forgotten unicorn to puma in a comment.
| * | | | Fixed forgotten unicorn to puma in a comment.Dennis Boldt2013-05-061-1/+1
| | | | |
* | | | | Update CHANGELOGDmitriy Zaporozhets2013-05-061-0/+3
|/ / / /
* | | | Merge branch 'feature/improve_deploy_keys' of ↵Dmitriy Zaporozhets2013-05-0631-285/+443
|\ \ \ \ | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | Add migration code for existing deploy keysDmitriy Zaporozhets2013-05-061-0/+13
| | | | |
| * | | | modify api to work with new deploy keysDmitriy Zaporozhets2013-05-065-52/+54
| | | | |
| * | | | Feature: Deploy keys between projectsDmitriy Zaporozhets2013-05-0613-105/+86
| | | | |
| * | | | Remove project_id from keys tableDmitriy Zaporozhets2013-05-062-3/+10
| | | | |
| * | | | Feature tests for deploy keysDmitriy Zaporozhets2013-05-063-59/+138
| | | | |
| * | | | Model specs for DeployKeysDmitriy Zaporozhets2013-05-064-26/+50
| | | | |
| * | | | Check git version in gitlab:checkDmitriy Zaporozhets2013-05-061-0/+15
| | | | |
| * | | | migrations for ssh key STI and deploy keys <-> projects relationDmitriy Zaporozhets2013-05-063-33/+60
| | | | |
| * | | | Create DeployKey & DeployKeysProject models. Bulding many to many relation ↵Dmitriy Zaporozhets2013-05-063-8/+18
| |/ / / | | | | | | | | | | | | between deploy keys and projects
* | | | Merge pull request #3845 from senny/link_contribution_guide_to_test_sectionDmitriy Zaporozhets2013-05-061-1/+1
|\ \ \ \ | |/ / / |/| | | link contribution guide to test section in README
| * | | link contribution guide to test section in READMEYves Senn2013-05-061-1/+1
| |/ /
* | | Merge pull request #3837 from majjacz/patch-1Dmitriy Zaporozhets2013-05-051-1/+1
|\ \ \ | | | | | | | | Changed forgotten unicorn to puma in the init script
| * | | Changed forgotten unicorn to puma in the init scriptmajjacz2013-05-041-1/+1
| | | |
* | | | Merge pull request #3841 from falk/masterDmitriy Zaporozhets2013-05-051-1/+1
|\ \ \ \ | |_|_|/ |/| | | Remove 2000 char limit on issue description