summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Increase atom feed test coverage. Prevent 500 error if description is missingDmitriy Zaporozhets2014-09-204-4/+33
* Refactor coverage tools usageDmitriy Zaporozhets2014-09-192-12/+12
* Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce i...Dmitriy Zaporozhets2014-09-191-2/+2
|\
| * Updated simplecov to 0.9.0DJ Mountney2014-09-021-2/+2
* | Ask coveralls to merge resultsDmitriy Zaporozhets2014-09-192-2/+2
* | Fix dev fixturesDmitriy Zaporozhets2014-09-181-2/+2
* | 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-1782-569/+586
|\ \ \
| * \ \ Merge branch 'use-members-models' into 'refator-members-logic'Dmitriy Zaporozhets2014-09-1585-610/+534
| |\ \ \
| | * | | Fix finder and tests for new membership modelsDmitriy Zaporozhets2014-09-156-6/+6
| | * | | More fixes to project members apiDmitriy Zaporozhets2014-09-151-2/+2
| | * | | Fix access_level apiDmitriy Zaporozhets2014-09-153-8/+11
| | * | | Replace project_access attribute with access_level in specs and APIDmitriy Zaporozhets2014-09-1510-32/+32
| | * | | Move hook models in separate dirDmitriy Zaporozhets2014-09-155-0/+1
| | * | | Fix project member managementDmitriy Zaporozhets2014-09-153-3/+3
| | * | | Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-1520-63/+63
| | * | | Fix STI+polymorphic for Group <-> GroupMemberDmitriy Zaporozhets2014-09-149-10/+12
| | * | | Fix migration and association for new members tableDmitriy Zaporozhets2014-09-149-60/+56
| | * | | Replace old references of users_project & users_groupDmitriy Zaporozhets2014-09-1417-26/+26
| | * | | Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-1462-470/+392
| |/ / /
| * | | Add STI to Member modelDmitriy Zaporozhets2014-09-142-0/+4
| * | | Migrate old membership objects to new Member modelDmitriy Zaporozhets2014-09-142-1/+32
| * | | Add Member AR modelDmitriy Zaporozhets2014-09-142-0/+33
| * | | Add members table migrationDmitriy Zaporozhets2014-09-142-1/+26
* | | | Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq ...Dmitriy Zaporozhets2014-09-173-7/+18
|\ \ \ \
| * | | | Fix README anchor testsDmitriy Zaporozhets2014-09-172-4/+14
| * | | | Make tree readme title - a link with anchor to README sectionDmitriy Zaporozhets2014-08-271-3/+4
* | | | | Version 7.3.rc1.v7.3.0.rc1Marin Jankovski2014-09-171-1/+1
* | | | | Updates to the update/install docs for 7.3.rc1Marin Jankovski2014-09-173-24/+158
* | | | | Highlight the word master when referring to a branch name to make it more obv...Sytse Sijbrandij2014-09-171-1/+1
* | | | | Merge branch 'doc/welcome_message' into 'master'Job van der Voort2014-09-172-0/+35
|\ \ \ \ \
| * | | | | Document the extra.sign_in_text setting for CEJacob Vosmaer2014-08-202-0/+35
* | | | | | Merge branch 'gitlab_check_hooks_symlink' into 'master'Dmitriy Zaporozhets2014-09-161-62/+17
|\ \ \ \ \ \
| * | | | | | Check for hooks directory symlink in gitlab:checkJacob Vosmaer2014-09-161-62/+17
* | | | | | | Merge branch 'dont-rebase-pushed-commits' into 'master'Dmitriy Zaporozhets2014-09-161-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Don't rebase pushed commits.Sytse Sijbrandij2014-09-161-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'new_relic' into 'master'Dmitriy Zaporozhets2014-09-164-0/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add dormant New Relic gemJacob Vosmaer2014-09-164-0/+21
|/ / / / / /
* | | | | | Merge branch 'order_mr_api' into 'master'Marin Jankovski2014-09-164-0/+73
|\ \ \ \ \ \
| * | | | | | Fix typo in comment.Marin Jankovski2014-09-161-1/+1
| * | | | | | Different created_at and updated_at time in api merge_requests spec.Marin Jankovski2014-09-151-31/+55
| * | | | | | Ordering and sorting for MR in api.Marin Jankovski2014-09-154-0/+49
* | | | | | | Merge branch 'redis_socket' into 'master'Dmitriy Zaporozhets2014-09-154-4/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use sockets to connect to RedisJacob Vosmaer2014-09-124-4/+46
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-152-5/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7753 from tamers/patch-1Robert Schilling2014-09-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix grammatical error in 'not merged changes' msgTamer Sherif2014-09-141-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #7528 from exromany/patch-1Robert Schilling2014-09-131-4/+4
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | move env to end of linesexromany2014-08-191-4/+4