summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Factor issue and edit MR form label field and submit.Ciro Santilli2014-09-224-34/+22
* Merge pull request #7772 from cirosantilli/resize-verticalDmitriy Zaporozhets2014-09-222-1/+4
|\
| * Set textarea resize:vertical by default.Ciro Santilli2014-09-192-1/+4
* | Merge pull request #7657 from cirosantilli/factor-commit-listDmitriy Zaporozhets2014-09-223-24/+13
|\ \
| * | Factor out commit list from compare and new MR.Ciro Santilli2014-09-143-24/+13
* | | Merge pull request #7792 from cirosantilli/link_to_reply_diffDmitriy Zaporozhets2014-09-221-4/+3
|\ \ \
| * | | Fix link_to_reply_diff.Ciro Santilli2014-09-191-4/+3
| | |/ | |/|
* | | Merge pull request #7804 from cirosantilli/factor-issue-mr-form-errorDmitriy Zaporozhets2014-09-223-12/+7
|\ \ \
| * | | Factor issue and MR edit form error list.Ciro Santilli2014-09-203-12/+7
| |/ /
* | | Merge pull request #7807 from cirosantilli/factor-service-errorDmitriy Zaporozhets2014-09-2210-67/+57
|\ \ \
| * | | Factor error and success methods from services.Ciro Santilli2014-09-2110-67/+57
* | | | Merge pull request #7758 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-221-5/+5
|\ \ \ \
| * | | | cleanup empty repo pageBen Bodenmiller2014-09-161-5/+5
* | | | | Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into ...Dmitriy Zaporozhets2014-09-2240-376/+379
|\ \ \ \ \
| * | | | | Replace old spinach step definitions with step.Ciro Santilli2014-09-2240-376/+379
| | |/ / / | |/| | |
* | | | | Merge pull request #7821 from cirosantilli/factor-spinach-classesDmitriy Zaporozhets2014-09-2252-52/+52
|\ \ \ \ \
| * | | | | Prefix Spinach features with Spinach::Features::.Ciro Santilli2014-09-2252-52/+52
* | | | | | Merge branch 'update-highlight-js' into 'master'Dmitriy Zaporozhets2014-09-221-1/+1
|\ \ \ \ \ \
| * | | | | | Update highlight.js to 8.2, fixes #519Robert Schilling2014-08-231-1/+1
* | | | | | | Merge branch '7-4-pre' into 'master'Dmitriy Zaporozhets2014-09-2296-604/+662
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | | | | | Merge branch 'monthly_release_document_update' into 'master'Sytse Sijbrandij2014-09-221-33/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | More updates to release doc.Marin Jankovski2014-09-221-24/+30