summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Remove code duplication in gitlab_markdown_helper.rbDmitriy Zaporozhets2015-11-171-28/+24
| * | | Remove duplication in issue emailsDmitriy Zaporozhets2015-11-161-36/+30
| * | | Allow flay to fail for now since there is still a lot of refactoring todoDmitriy Zaporozhets2015-11-161-0/+1
| * | | Remove duplication in reference filtersDmitriy Zaporozhets2015-11-164-166/+119
| * | | Refactor select2 tagsDmitriy Zaporozhets2015-11-162-11/+14
| * | | Dont allow code duplication check to failDmitriy Zaporozhets2015-11-161-1/+0
* | | | Bump VERSIONRobert Speicher2015-11-171-1/+1
* | | | 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
| | |_|/ | |/| |
* | | | Update CHANGELOGRobert Speicher2015-11-171-1/+3
* | | | Update monthly release templateRobert Speicher2015-11-171-12/+16
* | | | Merge pull request #9833 from huacnlee/fix/pr-9820-missingsRobert Speicher2015-11-171-2/+1
|\ \ \ \
| * | | | Avoid render edit_form when visitor can't edit them.Jason Lee2015-11-171-2/+1
|/ / / /
* | | | Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-179-18/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-169-18/+24
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-173-1/+29
|\ \ \ \
| * \ \ \ 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-172-0/+28
| |\ \ \ \ \
| | * | | | | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-projectRobert Speicher2015-11-162-0/+28
| | | |/ / / | | |/| | |
* | | | | | Merge pull request #9837 from Great-Antique/masterRobert Schilling2015-11-171-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix md syntax in doc/api/commits.mdDen Girnyk2015-11-171-2/+2
|/ / / / /
* | | | | Merge branch 'http-to-https' into 'master' Achilleas Pipinellis2015-11-1720-45/+45
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Rewrite HTTP links to force TLS, where possibleAlex Jordan2015-11-1620-45/+45
* | | | | Merge branch 'global-milestones' into 'master' Dmitriy Zaporozhets2015-11-1637-258/+398
|\ \ \ \ \
| * | | | | Some code and doc improvementsglobal-milestonesDmitriy Zaporozhets2015-11-164-6/+10
| * | | | | 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