summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'first-meaningful-line-in-md' of https://github.com/yglukhov/git...Dmitriy Zaporozhets2014-09-173-8/+9
|\
| * Changed activity notes to display first MEANINGFUL line.uran2014-09-123-8/+9
* | Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/g...Dmitriy Zaporozhets2014-09-1746-350/+334
|\ \
| * | Fix finder and tests for new membership modelsDmitriy Zaporozhets2014-09-151-1/+1
| * | Move hook models in separate dirDmitriy Zaporozhets2014-09-154-0/+0
| * | Fix project member managementDmitriy Zaporozhets2014-09-153-3/+3
| * | Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-1511-33/+33
| * | Fix STI+polymorphic for Group <-> GroupMemberDmitriy Zaporozhets2014-09-147-7/+10
| * | Fix migration and association for new members tableDmitriy Zaporozhets2014-09-144-4/+8
| * | Replace old references of users_project & users_groupDmitriy Zaporozhets2014-09-1410-18/+18
| * | Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-1437-322/+277
| * | Add STI to Member modelDmitriy Zaporozhets2014-09-142-0/+4
| * | Add Member AR modelDmitriy Zaporozhets2014-09-141-0/+18
* | | Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq ...Dmitriy Zaporozhets2014-09-171-3/+4
|\ \ \
| * | | Make tree readme title - a link with anchor to README sectionDmitriy Zaporozhets2014-08-271-3/+4
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-151-1/+1
|\ \ \ \
| * | | | Fix grammatical error in 'not merged changes' msgTamer Sherif2014-09-141-1/+1
| | |/ / | |/| |
* | | | Merge branch 'implement_comments_on_parallel_diff' into 'master'Dmitriy Zaporozhets2014-09-154-22/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Move organizing of comments to helper.Marin Jankovski2014-09-122-14/+22
| * | | Remove unecesarry array operations.Marin Jankovski2014-09-123-17/+16
| * | | Add comments on the side-by-side diff.Marin Jankovski2014-09-124-15/+44
* | | | Adding ability to configure webhook timeout via gitlab.ymlWes Gurney2014-09-121-1/+1
|/ / /
* | | Merge pull request #7662 from Razer6/disable_buttons_on_empty_formDmitriy Zaporozhets2014-09-123-7/+12
|\ \ \
| * | | Disable buttons if required forms are emptyRobert Schilling2014-09-113-7/+12
* | | | Merge pull request #7522 from Razer6/fix_tags_countDmitriy Zaporozhets2014-09-124-14/+18
|\ \ \ \
| * | | | update tags count if tag gets deletedRobert Schilling2014-09-124-14/+18
| |/ / /
* | | | Merge pull request #7713 from bbodenmiller/patch-5Sytse Sijbrandij2014-09-121-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | add requests linkBen Bodenmiller2014-09-121-0/+1
* | | | Merge pull request #7737 from Razer6/feature/zenmasterDmitriy Zaporozhets2014-09-128-8/+215
|\ \ \ \
| * | | | Close Zen mode by ESC, foward/backwardRobert Schilling2014-09-114-3/+59
| * | | | Implement zen mode for issues/MRs/notesRobert Schilling2014-09-115-6/+157
| | |/ / | |/| |
* | | | Fix serialize migration. Fixes #7734Drew Blessing2014-09-111-1/+6
|/ / /
* | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-09-111-4/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into feature-oauth-refactoringJan-Willem van der Meer2014-09-1186-536/+747
| |\ \ \
| * | | | Refactor Oauth::User class to use instance methodsJan-Willem van der Meer2014-09-031-4/+0
* | | | | Make labels clickableDmitriy Zaporozhets2014-09-114-4/+8
| |/ / / |/| | |
* | | | Merge branch 'project-destroy-redirect' into 'master'Dmitriy Zaporozhets2014-09-111-1/+9
|\ \ \ \
| * | | | Incorporating Dmitriy's referrer-based routing suggestionKevin Boyd2014-09-051-1/+6
| * | | | Fine-tune the Remove Project redirect. Now it redirects to admin_projects_pat...Kevin Boyd2014-08-291-1/+4
* | | | | Merge pull request #7730 from bbodenmiller/patch-12Dmitriy Zaporozhets2014-09-112-2/+2
|\ \ \ \ \
| * | | | | url -> URLBen Bodenmiller2014-09-101-1/+1
| * | | | | url -> URLBen Bodenmiller2014-09-101-1/+1
* | | | | | Increase import timeout from 2 to 4 minutesBen Bodenmiller2014-09-101-1/+1
|/ / / / /
* | | | | Typo localy -> locally.Ciro Santilli2014-09-101-1/+1
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-1011-67/+39
|\ \ \ \ \
| * \ \ \ \ Merge pull request #7705 from dblessing/serialize_service_propertiesDmitriy Zaporozhets2014-09-1011-67/+39
| |\ \ \ \ \
| | * | | | | Serialize services propertiesDrew Blessing2014-09-1011-67/+39
* | | | | | | Merge branch 'word_wrap_in_description' into 'master'Dmitriy Zaporozhets2014-09-101-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Wrap text that overflows the description field.Marin Jankovski2014-09-101-0/+2
* | | | | | | Wrap should always be enabled for parallel diff.Marin Jankovski2014-09-102-4/+5
|/ / / / / /