summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* DRY up codedirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-181-30/+24
* Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-181-1/+1
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-182-2/+143
| |\
| * \ Merge pull request #9838 from evindor/masterDouwe Maan2015-11-181-1/+1
| |\ \
| | * | Fix github importer to handle empty issuesArseny Zarechnev2015-11-181-1/+1
* | | | Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-1850-554/+724
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'add_lfs_doc' into 'master' Job van der Voort2015-11-181-0/+136
| |\ \ \
| | * | | missing .Job van der Voort2015-11-181-4/+2
| | * | | Updates to the lfs doc.Marin Jankovski2015-11-181-13/+24
| | * | | LFS doc, first draftadd_lfs_docMarin Jankovski2015-11-171-0/+127
| * | | | Merge branch 'issue-labels' into 'master' Sytse Sijbrandij2015-11-171-2/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Example workflow.Sytse Sijbrandij2015-11-171-0/+2
| | * | | More labels since we get more specializations.issue-labelsSytse Sijbrandij2015-11-171-2/+5
| * | | | Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-172-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-172-3/+3
| * | | | Fix CHANGELOGRobert Speicher2015-11-171-2/+1
| * | | | Merge branch 'contributor-graph-by-email' into 'master'Robert Speicher2015-11-172-4/+5
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into contributor-graph-by-emailcontributor-graph-by-emailDouwe Maan2015-11-17502-2349/+8281
| | |\ \ \ \
| | * | | | | Update changelogDouwe Maan2015-10-291-1/+2
| | * | | | | Fix grouping of contributors by email in graph.Douwe Maan2015-10-291-3/+2
| * | | | | | Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'mast...Robert Speicher2015-11-174-12/+24
| |\ \ \ \ \ \
| | * | | | | | Remove extra spaceadamliesko/gitlab-ce-notification-upon-unassignmentDouwe Maan2015-11-171-1/+1
| | * | | | | | Add tests for merge request update.Douwe Maan2015-11-172-5/+8
| | * | | | | | Add credits to changelogDouwe Maan2015-11-171-1/+1
| | * | | | | | Fix specDouwe Maan2015-11-171-4/+6
| | * | | | | | Don't fail when there was no previous assigneeDouwe Maan2015-11-171-8/+10
| | * | | | | | Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignmentDouwe Maan2015-11-17322-1500/+4730
| | |\ \ \ \ \ \
| | * | | | | | | Add notification to the former assignee upon unassignmentadamliesko2015-11-093-6/+11
| * | | | | | | | Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-1714-77/+149
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add changelog itemjames11/gitlab-ce-removable-group-ownerDouwe Maan2015-11-171-0/+1
| | * | | | | | | | Use project member abilities more extensivelyDouwe Maan2015-11-177-45/+49
| | * | | | | | | | Refactor ability changesDouwe Maan2015-11-175-71/+67
| | * | | | | | | | Merge branch 'master' into james11/gitlab-ce-removable-group-ownerDouwe Maan2015-11-17495-2349/+8219
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | fixing rubocop - random code not related to the changesJames Lopez2015-11-121-5/+9
| | * | | | | | | | fixing rubocop indentsJames Lopez2015-11-121-1/+2
| | * | | | | | | | fixing rubocop indentsJames Lopez2015-11-122-12/+14
| | * | | | | | | | updated exceptionJames Lopez2015-11-111-1/+1
| | * | | | | | | | refactored code as projects only have one owner. Kept some refactoring in pla...James Lopez2015-11-114-40/+35
| | * | | | | | | | refactored permissions and added update_project_member ability logic. Also re...James Lopez2015-11-035-24/+57
| | * | | | | | | | fix issue with adding members to project (spotted by test)James Lopez2015-10-301-2/+11
| | * | | | | | | | fixed last group owner issue and added testJames Lopez2015-10-293-4/+31
| * | | | | | | | | Merge branch 'remove-code-duplication'Dmitriy Zaporozhets2015-11-1722-434/+371
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Code duplication check should be enabled nowremove-code-duplicationDmitriy Zaporozhets2015-11-171-1/+0
| | * | | | | | | | Remove small code duplication in user_reference_filter.rbDmitriy Zaporozhets2015-11-171-6/+9
| | * | | | | | | | Refactor similar code for Issue and MR update serviceDmitriy Zaporozhets2015-11-173-57/+53
| | * | | | | | | | Remove code duplication in notification_service.rbDmitriy Zaporozhets2015-11-171-28/+18
| | * | | | | | | | Remove duplication in mailers/emails/notes.rbDmitriy Zaporozhets2015-11-172-45/+52
| | * | | | | | | | Set higher flay value to avoid unnecessary refactoring for nowDmitriy Zaporozhets2015-11-171-1/+1
| | * | | | | | | | Refactor duplciate code for groups_controller.rb and slack_service/note_messa...Dmitriy Zaporozhets2015-11-176-50/+46
| | * | | | | | | | Remove duplication in diff_helper.rbDmitriy Zaporozhets2015-11-171-16/+16