summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into dbalexandre/gitlab-ce-fix-personal-snippet-access-...Douwe Maan2015-11-1741-151/+347
|\
| * 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
* | | Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-0910-20/+32
|\ \ \ | |/ /
| * | 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 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-032-1/+10
|\ \ \ | |/ /
| * | 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
| | |/
| * | Merge branch 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-031-0/+9
| |\ \ | | |/ | |/|
| | * Refactor search by commits messageolhado/gitlab-ce-commit-searchDmitriy Zaporozhets2015-11-021-3/+3
| | * Actually converted code to following suggestions.Michael Chmielewski2015-10-281-6/+3
| | * Fixed method to use git log via Popen as recommended, and made output match t...Michael Chmielewski2015-10-281-1/+6
| | * Trying to incorporate suggestions from comments on Merge Request 1661Michael Chmielewski2015-10-281-4/+5
| | * Add support for searching commit log messagesJonathan Schoeffling2015-10-281-0/+6
* | | Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-022-16/+11
|\ \ \ | |/ /
| * | Use a subquery with IDs only for find_by_any_emailYorick Peterse2015-10-301-9/+7
| * | Fixed UNION syntax for MySQLYorick Peterse2015-10-301-2/+2
| * | Use a UNION for User.find_by_any_emailYorick Peterse2015-10-301-3/+12
| * | Improve performance of User.find_by_any_emailYorick Peterse2015-10-301-15/+3
View Lorry Controller Status