Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-15 | 1 | -1/+1 |
|\ | |||||
| * | Fix grammatical error in 'not merged changes' msg | Tamer Sherif | 2014-09-14 | 1 | -1/+1 |
* | | Merge branch 'implement_comments_on_parallel_diff' into 'master' | Dmitriy Zaporozhets | 2014-09-15 | 4 | -22/+58 |
|\ \ | |/ |/| | |||||
| * | Move organizing of comments to helper. | Marin Jankovski | 2014-09-12 | 2 | -14/+22 |
| * | Remove unecesarry array operations. | Marin Jankovski | 2014-09-12 | 3 | -17/+16 |
| * | Add comments on the side-by-side diff. | Marin Jankovski | 2014-09-12 | 4 | -15/+44 |
* | | Adding ability to configure webhook timeout via gitlab.yml | Wes Gurney | 2014-09-12 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #7662 from Razer6/disable_buttons_on_empty_form | Dmitriy Zaporozhets | 2014-09-12 | 3 | -7/+12 |
|\ | |||||
| * | Disable buttons if required forms are empty | Robert Schilling | 2014-09-11 | 3 | -7/+12 |
* | | Merge pull request #7522 from Razer6/fix_tags_count | Dmitriy Zaporozhets | 2014-09-12 | 4 | -14/+18 |
|\ \ | |||||
| * | | update tags count if tag gets deleted | Robert Schilling | 2014-09-12 | 4 | -14/+18 |
| |/ | |||||
* | | Merge pull request #7713 from bbodenmiller/patch-5 | Sytse Sijbrandij | 2014-09-12 | 1 | -0/+1 |
|\ \ | |||||
| * | | add requests link | Ben Bodenmiller | 2014-09-12 | 1 | -0/+1 |
* | | | Merge pull request #7737 from Razer6/feature/zenmaster | Dmitriy Zaporozhets | 2014-09-12 | 8 | -8/+215 |
|\ \ \ | |||||
| * | | | Close Zen mode by ESC, foward/backward | Robert Schilling | 2014-09-11 | 4 | -3/+59 |
| * | | | Implement zen mode for issues/MRs/notes | Robert Schilling | 2014-09-11 | 5 | -6/+157 |
| | |/ | |/| | |||||
* | | | Fix serialize migration. Fixes #7734 | Drew Blessing | 2014-09-11 | 1 | -1/+6 |
|/ / | |||||
* | | Merge branch 'feature-oauth-refactoring' into 'master' | Dmitriy Zaporozhets | 2014-09-11 | 1 | -4/+0 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring | Jan-Willem van der Meer | 2014-09-11 | 86 | -536/+747 |
| |\ \ | |||||
| * | | | Refactor Oauth::User class to use instance methods | Jan-Willem van der Meer | 2014-09-03 | 1 | -4/+0 |
* | | | | Make labels clickable | Dmitriy Zaporozhets | 2014-09-11 | 4 | -4/+8 |
| |/ / |/| | | |||||
* | | | Merge branch 'project-destroy-redirect' into 'master' | Dmitriy Zaporozhets | 2014-09-11 | 1 | -1/+9 |
|\ \ \ | |||||
| * | | | Incorporating Dmitriy's referrer-based routing suggestion | Kevin Boyd | 2014-09-05 | 1 | -1/+6 |
| * | | | Fine-tune the Remove Project redirect. Now it redirects to admin_projects_pat... | Kevin Boyd | 2014-08-29 | 1 | -1/+4 |
* | | | | Merge pull request #7730 from bbodenmiller/patch-12 | Dmitriy Zaporozhets | 2014-09-11 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | url -> URL | Ben Bodenmiller | 2014-09-10 | 1 | -1/+1 |
| * | | | | url -> URL | Ben Bodenmiller | 2014-09-10 | 1 | -1/+1 |
* | | | | | Increase import timeout from 2 to 4 minutes | Ben Bodenmiller | 2014-09-10 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Typo localy -> locally. | Ciro Santilli | 2014-09-10 | 1 | -1/+1 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-10 | 11 | -67/+39 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #7705 from dblessing/serialize_service_properties | Dmitriy Zaporozhets | 2014-09-10 | 11 | -67/+39 |
| |\ \ \ \ | |||||
| | * | | | | Serialize services properties | Drew Blessing | 2014-09-10 | 11 | -67/+39 |
* | | | | | | Merge branch 'word_wrap_in_description' into 'master' | Dmitriy Zaporozhets | 2014-09-10 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Wrap text that overflows the description field. | Marin Jankovski | 2014-09-10 | 1 | -0/+2 |
* | | | | | | Wrap should always be enabled for parallel diff. | Marin Jankovski | 2014-09-10 | 2 | -4/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'parallel_diff_refactor' into 'master' | Dmitriy Zaporozhets | 2014-09-09 | 24 | -282/+249 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typo. | Marin Jankovski | 2014-09-09 | 2 | -2/+2 |
| * | | | | | Add line code to parallel diff for linking. | Marin Jankovski | 2014-09-09 | 2 | -12/+13 |
| * | | | | | Use the new path to the partial, move the diff related methods to the new hel... | Marin Jankovski | 2014-09-09 | 3 | -14/+13 |
| * | | | | | Fix usage of diff file mode change | Dmitriy Zaporozhets | 2014-09-08 | 1 | -1/+1 |
| * | | | | | optimize show_diff_size_warning? | Dmitriy Zaporozhets | 2014-09-08 | 3 | -6/+11 |
| * | | | | | Refactoring inside refactoring. We need to go deeper | Dmitriy Zaporozhets | 2014-09-08 | 13 | -104/+100 |
| * | | | | | Fix all broken stuff after diff refactoring | Dmitriy Zaporozhets | 2014-09-08 | 6 | -30/+5 |
| * | | | | | Use new diff parsing logic | Dmitriy Zaporozhets | 2014-09-08 | 8 | -74/+72 |
| * | | | | | Refactor diff views | Dmitriy Zaporozhets | 2014-09-08 | 11 | -64/+92 |
| * | | | | | Cleanup | Marin Jankovski | 2014-09-08 | 1 | -13/+6 |
| * | | | | | Now refactor all to work properly. | Marin Jankovski | 2014-09-08 | 2 | -111/+69 |
| * | | | | | Color the lines correctly. | Marin Jankovski | 2014-09-08 | 1 | -8/+10 |
| * | | | | | Don't show the line numbers if the lines were removed. | Marin Jankovski | 2014-09-08 | 1 | -2/+6 |
| * | | | | | Take the next type into consideration | Marin Jankovski | 2014-09-08 | 2 | -4/+5 |