Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'first-meaningful-line-in-md' of https://github.com/yglukhov/git... | Dmitriy Zaporozhets | 2014-09-17 | 3 | -8/+9 |
|\ | |||||
| * | Changed activity notes to display first MEANINGFUL line. | uran | 2014-09-12 | 3 | -8/+9 |
* | | Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/g... | Dmitriy Zaporozhets | 2014-09-17 | 46 | -350/+334 |
|\ \ | |||||
| * | | Fix finder and tests for new membership models | Dmitriy Zaporozhets | 2014-09-15 | 1 | -1/+1 |
| * | | Move hook models in separate dir | Dmitriy Zaporozhets | 2014-09-15 | 4 | -0/+0 |
| * | | Fix project member management | Dmitriy Zaporozhets | 2014-09-15 | 3 | -3/+3 |
| * | | Fix adminarea and emails for new membership logic | Dmitriy Zaporozhets | 2014-09-15 | 11 | -33/+33 |
| * | | Fix STI+polymorphic for Group <-> GroupMember | Dmitriy Zaporozhets | 2014-09-14 | 7 | -7/+10 |
| * | | Fix migration and association for new members table | Dmitriy Zaporozhets | 2014-09-14 | 4 | -4/+8 |
| * | | Replace old references of users_project & users_group | Dmitriy Zaporozhets | 2014-09-14 | 10 | -18/+18 |
| * | | Huge replace of old users_project and users_group references | Dmitriy Zaporozhets | 2014-09-14 | 37 | -322/+277 |
| * | | Add STI to Member model | Dmitriy Zaporozhets | 2014-09-14 | 2 | -0/+4 |
| * | | Add Member AR model | Dmitriy Zaporozhets | 2014-09-14 | 1 | -0/+18 |
* | | | Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq ... | Dmitriy Zaporozhets | 2014-09-17 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Make tree readme title - a link with anchor to README section | Dmitriy Zaporozhets | 2014-08-27 | 1 | -3/+4 |
* | | | | 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 |
|/ / / / / / |