Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bring more usability to issues filtering. Block issues area on loading ↵ | Dmitriy Zaporozhets | 2013-05-08 | 6 | -60/+670 |
| | | | | filtered results | ||||
* | init filter links | Dmitriy Zaporozhets | 2013-05-08 | 2 | -4/+15 |
| | |||||
* | replace selectboxes with filters | Dmitriy Zaporozhets | 2013-05-08 | 3 | -5/+55 |
| | |||||
* | Merge pull request #3862 from crazyscience/patch-3 | Dmitriy Zaporozhets | 2013-05-07 | 3 | -0/+7 |
|\ | | | | | Setting the working directory before git operations | ||||
| * | Setting the working directory before git operations | crazyscience | 2013-05-07 | 3 | -0/+7 |
| | | |||||
* | | Merge pull request #3877 from mikehaertl/3793-puma-relative-url | Dmitriy Zaporozhets | 2013-05-07 | 1 | -0/+4 |
|\ \ | | | | | | | Puma configuration for relative base URL | ||||
| * | | Fixes #3793: Puma configuration for relative base URL | Michael Härtl | 2013-05-08 | 1 | -0/+4 |
|/ / | |||||
* | | Merge pull request #3874 from axilleas/installation-fix | Dmitriy Zaporozhets | 2013-05-07 | 1 | -2/+2 |
|\ \ | | | | | | | Bump charlock_holmes to 0.9.6.4 | ||||
| * | | Bump charlock_holmes to 0.9.6.4 | Axilleas Pipinellis | 2013-05-07 | 1 | -2/+2 |
|/ / | | | | | | | Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr> | ||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2013-05-07 | 2 | -1/+5 |
|\ \ | |||||
| * \ | Merge pull request #3871 from axilleas/backup-fix | Dmitriy Zaporozhets | 2013-05-07 | 2 | -1/+5 |
| |\ \ | | | | | | | | | Fix errors during backup task. Fix #3785 | ||||
| | * | | Fix errors during backup task. Fix #3785 | Axilleas Pipinellis | 2013-05-07 | 2 | -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/gitlabhq | Dmitriy Zaporozhets | 2013-05-07 | 11 | -30/+94 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix api delete hook test | Dmitriy Zaporozhets | 2013-05-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | Include default labels in issues autocomplete etc. Show colored labels on ↵ | Dmitriy Zaporozhets | 2013-05-07 | 8 | -46/+53 |
| | | | | | | | | | | | | | | | | issues show page | ||||
| * | | | add Gitlab::Label class and different color labels for default labels set | Dmitriy Zaporozhets | 2013-05-07 | 3 | -1/+45 |
| | | | | |||||
| * | | | Add generate action to labels controller which allow creation of default ↵ | Dmitriy Zaporozhets | 2013-05-07 | 3 | -4/+17 |
|/ / / | | | | | | | | | | labels set for project | ||||
* | | | Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes | Dmitriy Zaporozhets | 2013-05-07 | 46 | -303/+302 |
|\ \ \ | | | | | | | | | Code cleanup: Replace old hashes and remove trailing spaces | ||||
| * | | | Repair failed test | Andrey Kumanyaev | 2013-05-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove trailing spaces | Andrey Kumanyaev | 2013-05-05 | 11 | -173/+173 |
| | | | | |||||
| * | | | Replace old hashes with new 1.9 ruby hashes (rebase) | Andrey Kumanyaev | 2013-05-05 | 38 | -131/+130 |
| | | | | |||||
* | | | | Merge pull request #3868 from hiroponz/fix_check_git_version | Dmitriy Zaporozhets | 2013-05-07 | 1 | -4/+22 |
|\ \ \ \ | | | | | | | | | | | Fix check git version. | ||||
| * | | | | Fix check git version. | Sato Hiroyuki | 2013-05-07 | 1 | -4/+22 |
| | |_|/ | |/| | | | | | | | | | | Checking is "yes" only if git version equals "1.7.10" exactly. | ||||
* | | | | Merge pull request #3866 from senny/maintenance_guidelines | Dmitriy Zaporozhets | 2013-05-07 | 3 | -0/+27 |
|\ \ \ \ | | | | | | | | | | | maintenance policy | ||||
| * | | | | maintenance policy draft | Yves Senn | 2013-05-07 | 3 | -0/+27 |
| | | | | | |||||
* | | | | | Merge pull request #3852 from axilleas/minitest-fix | Dmitriy Zaporozhets | 2013-05-07 | 2 | -0/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add minitest to Gemfile. Fix #3826 | ||||
| * | | | | Add minitest to Gemfile. Fix #3826 | Axilleas Pipinellis | 2013-05-07 | 2 | -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-api | Dmitriy Zaporozhets | 2013-05-06 | 2 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | fix API route to delete project hook | ||||
| * | | | | fix API route to delete project hook | Nihad Abbasov | 2013-05-07 | 2 | -5/+5 |
|/ / / / | |||||
* | | | | Restyle admin -> groups page | Dmitriy Zaporozhets | 2013-05-06 | 1 | -24/+35 |
| | | | | |||||
* | | | | Style pagination | Dmitriy Zaporozhets | 2013-05-06 | 1 | -0/+6 |
| | | | | |||||
* | | | | Usability improvements to deploy leys | Dmitriy Zaporozhets | 2013-05-06 | 2 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #3847 from boldt/unicorn-to-puma | Dmitriy Zaporozhets | 2013-05-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixed forgotten unicorn to puma in a comment. | ||||
| * | | | | Fixed forgotten unicorn to puma in a comment. | Dennis Boldt | 2013-05-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Update CHANGELOG | Dmitriy Zaporozhets | 2013-05-06 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | Merge branch 'feature/improve_deploy_keys' of ↵ | Dmitriy Zaporozhets | 2013-05-06 | 31 | -285/+443 |
|\ \ \ \ | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | | Add migration code for existing deploy keys | Dmitriy Zaporozhets | 2013-05-06 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | modify api to work with new deploy keys | Dmitriy Zaporozhets | 2013-05-06 | 5 | -52/+54 |
| | | | | | |||||
| * | | | | Feature: Deploy keys between projects | Dmitriy Zaporozhets | 2013-05-06 | 13 | -105/+86 |
| | | | | | |||||
| * | | | | Remove project_id from keys table | Dmitriy Zaporozhets | 2013-05-06 | 2 | -3/+10 |
| | | | | | |||||
| * | | | | Feature tests for deploy keys | Dmitriy Zaporozhets | 2013-05-06 | 3 | -59/+138 |
| | | | | | |||||
| * | | | | Model specs for DeployKeys | Dmitriy Zaporozhets | 2013-05-06 | 4 | -26/+50 |
| | | | | | |||||
| * | | | | Check git version in gitlab:check | Dmitriy Zaporozhets | 2013-05-06 | 1 | -0/+15 |
| | | | | | |||||
| * | | | | migrations for ssh key STI and deploy keys <-> projects relation | Dmitriy Zaporozhets | 2013-05-06 | 3 | -33/+60 |
| | | | | | |||||
| * | | | | Create DeployKey & DeployKeysProject models. Bulding many to many relation ↵ | Dmitriy Zaporozhets | 2013-05-06 | 3 | -8/+18 |
| |/ / / | | | | | | | | | | | | | between deploy keys and projects | ||||
* | | | | Merge pull request #3845 from senny/link_contribution_guide_to_test_section | Dmitriy Zaporozhets | 2013-05-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | link contribution guide to test section in README | ||||
| * | | | link contribution guide to test section in README | Yves Senn | 2013-05-06 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3837 from majjacz/patch-1 | Dmitriy Zaporozhets | 2013-05-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Changed forgotten unicorn to puma in the init script | ||||
| * | | | Changed forgotten unicorn to puma in the init script | majjacz | 2013-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3841 from falk/master | Dmitriy Zaporozhets | 2013-05-05 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Remove 2000 char limit on issue description |