summaryrefslogtreecommitdiff
path: root/app
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-1834-356/+388
|\
| * 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
| * | Merge branch 'contributor-graph-by-email' into 'master'Robert Speicher2015-11-171-3/+2
| |\ \
| | * \ Merge branch 'master' into contributor-graph-by-emailcontributor-graph-by-emailDouwe Maan2015-11-17253-1132/+2253
| | |\ \
| | * | | 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-171-4/+8
| |\ \ \ \
| | * | | | Remove extra spaceadamliesko/gitlab-ce-notification-upon-unassignmentDouwe Maan2015-11-171-1/+1
| | * | | | 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-17165-780/+1338
| | |\ \ \ \
| | * | | | | Add notification to the former assignee upon unassignmentadamliesko2015-11-091-2/+4
| * | | | | | Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-1711-77/+122
| |\ \ \ \ \ \
| | * | | | | | 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-17249-1130/+2235
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | 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-291-4/+5
| * | | | | | | Merge branch 'remove-code-duplication'Dmitriy Zaporozhets2015-11-1715-260/+242
| |\ \ \ \ \ \ \
| | * | | | | | | 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
| | * | | | | | | 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
| | * | | | | | | Remove code duplication in gitlab_markdown_helper.rbDmitriy Zaporozhets2015-11-171-28/+24
| | * | | | | | | Remove duplication in issue emailsDmitriy Zaporozhets2015-11-161-36/+30
| | * | | | | | | Refactor select2 tagsDmitriy Zaporozhets2015-11-162-11/+14
| * | | | | | | | Merge branch 'param-view' into 'master'Robert Speicher2015-11-176-9/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't use params[:view] directly.param-viewDouwe Maan2015-11-176-9/+12
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Avoid render edit_form when visitor can't edit them.Jason Lee2015-11-171-2/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Add "Start a new merge request" option to every commit formDouwe Maan2015-11-1720-157/+168
* | | | | | | | Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-17392-2653/+4401
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-175-16/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-165-16/+13
| * | | | | | | Merge branch 'issue/vars-need-eval' into 'master' Douwe Maan2015-11-171-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Ensure variable is evalledGert Goet2015-10-291-1/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'rs-wiki-touches-project' into 'master' Douwe Maan2015-11-171-0/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-projectRobert Speicher2015-11-161-0/+10
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'http-to-https' into 'master' Achilleas Pipinellis2015-11-172-4/+4
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Rewrite HTTP links to force TLS, where possibleAlex Jordan2015-11-162-4/+4
| * | | | | | | Merge branch 'global-milestones' into 'master' Dmitriy Zaporozhets2015-11-1624-186/+230
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Some code and doc improvementsglobal-milestonesDmitriy Zaporozhets2015-11-163-2/+6
| | * | | | | | Fix removing avatar for groupDmitriy Zaporozhets2015-11-161-1/+1
| | * | | | | | Group masters should be able to create/close milestonesDmitriy Zaporozhets2015-11-165-7/+9
View Lorry Controller Status