summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1847-230/+451
|\
| * Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-174-32/+73
| |\
| | * Refactor ability changesDouwe Maan2015-11-175-71/+67
| | * Merge branch 'master' into james11/gitlab-ce-removable-group-ownerDouwe Maan2015-11-1745-186/+398
| | |\
| | * | 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-171-15/+16
| |\ \ \ | | |_|/ | |/| |
| | * | Refactor duplciate code for groups_controller.rb and slack_service/note_messa...Dmitriy Zaporozhets2015-11-171-15/+16
| * | | 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 'global-milestones' into 'master' Dmitriy Zaporozhets2015-11-164-14/+35
| |\ \ \ | | |/ / | |/| |
| | * | Some code and doc improvementsglobal-milestonesDmitriy Zaporozhets2015-11-161-0/+4
| | * | Group masters should be able to create/close milestonesDmitriy Zaporozhets2015-11-161-0/+1
| | * | Refactor global and group milestones logicDmitriy Zaporozhets2015-11-163-14/+30
| * | | Merge branch 'ci-runners-master-or-owner' into 'master' Dmitriy Zaporozhets2015-11-161-5/+10
| |\ \ \ | | |/ / | |/| |
| | * | Show specific runners from projects where user is master or ownerci-runners-master-or-ownerKamil Trzcinski2015-11-161-5/+10
| * | | Merge branch 'refactor-duplication' into 'master' Dmitriy Zaporozhets2015-11-161-16/+7
| |\ \ \
| | * | | Remove duplicate code in Repository#*_names_containsDmitriy Zaporozhets2015-11-161-16/+7
| | |/ /
| * | | Add support for git lfs.lfsMarin Jankovski2015-11-163-0/+28
| |/ /
| * | Merge branch 'annotate-models' into 'master' Dmitriy Zaporozhets2015-11-1428-77/+177
| |\ \
| | * | Annotate modelsDmitriy Zaporozhets2015-11-1328-77/+177
| * | | Fix broken testsKamil Trzcinski2015-11-131-24/+0
| * | | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-6/+17
| |/ /
| * | Merge pull request #9825 from huacnlee/cache-application-settingDmitriy Zaporozhets2015-11-132-3/+15
| |\ \
| | * | Add caching for ApplicationSetting, Ci::ApplicationSetting.Jason Lee2015-11-122-3/+15
| * | | Add ignore white space option in merge request diffMinsik Yoon2015-11-132-2/+16
| * | | Change "recent" scopes to sort by "id"Yorick Peterse2015-11-112-2/+2
| * | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-114-0/+23
| |\ \ \ | | |/ / | |/| |
| | * | Implement Build ArtifactsKamil Trzcinski2015-11-104-0/+23
| * | | Fix Drone CI service template not saving properlyStan Hu2015-11-101-1/+0
| |/ /
| * | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-102-1/+7
| |\ \
| | * | Refactor release code a bitDmitriy Zaporozhets2015-11-091-1/+1
| | * | Add association and validation for Release modelDmitriy Zaporozhets2015-11-061-0/+3
| | * | More release related logic to separate resourceDmitriy Zaporozhets2015-11-051-1/+2
| | * | Add release modelDmitriy Zaporozhets2015-11-051-0/+2
| * | | Enable shared runners for all new projectsKamil Trzcinski2015-11-052-2/+6
| * | | CI details cleanupKamil Trzcinski2015-11-055-6/+14
| * | | Allow groups to appear in the search results if the group owner allows itValery Sizov2015-11-051-1/+1
| |/ /
| * | Merge branch 'rs-git-bin-path' into 'master' Douwe Maan2015-11-041-6/+6
| |\ \
| | * | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-031-6/+6
| * | | Merge branch 'remove-duplicate-orders' into 'master' Yorick Peterse2015-11-041-5/+5
| |\ \ \ | | |/ / | |/| |
| | * | Only sort by IDs by defaultYorick Peterse2015-11-031-5/+5
| * | | Merge branch 'only-syntax' into 'master' Kamil Trzciński2015-11-031-1/+1
| |\ \ \
| | * | | Extend yml syntax for only and except to support specifying repository pathKamil Trzcinski2015-11-021-1/+1
| | |/ /