summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-072-3/+11
* Limit queries to a user-branch combinationBob Van Landuyt2018-03-071-18/+27
* Allow abilities on forks while MR is openBob Van Landuyt2018-03-071-0/+29
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+18
* Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-072-6/+18
|\
| * Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-062-6/+18
* | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-073-2/+15
|\ \
| * | Add discussion APIjprovazn-apiJan Provaznik2018-03-073-2/+15
* | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-072-0/+67
|\ \ \
| * | | Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
| * | | Nested transaction for find_or_create_by! queries.Andreas Brandl2018-03-061-5/+11
| * | | Remove unnecessary safe guard.Andreas Brandl2018-03-061-6/+0
| * | | Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-061-3/+3
| * | | Singularize model name.Andreas Brandl2018-03-062-2/+2
| * | | Rename to UserInteractedProjects.Andreas Brandl2018-03-062-5/+5
| * | | Flush cached information about schema.Andreas Brandl2018-03-061-0/+6
| * | | Only track contributions if table is available.Andreas Brandl2018-03-062-1/+12
| * | | Address rubocop offenses.Andreas Brandl2018-03-061-28/+30
| * | | Treat special cases accordingly.Andreas Brandl2018-03-061-1/+15
| * | | Cache project/user combinations.Andreas Brandl2018-03-061-3/+19
| * | | Track which projects a user contributed to.Andreas Brandl2018-03-062-0/+18
| | |/ | |/|
* | | Unify deployment_platform interface with EELin Jen-Shin2018-03-072-2/+3
* | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-071-4/+4
|\ \ \
| * | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-061-4/+4
* | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-065-5/+15
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0623-73/+172
| |\ \ \ \
| * | | | | Fix a typo, a conflict and improve documentationissue_38337Felipe Artur2018-03-061-1/+1
| * | | | | Bring one group board to CEFelipe Artur2018-03-035-5/+16
* | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-067-105/+78
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-0642-134/+347
| |\ \ \ \ \
| * | | | | | Arg.id via method pointerPawel Chojnacki2018-03-061-1/+1
| * | | | | | Implemente Prometheus:AdapterServicePawel Chojnacki2018-03-052-28/+4
| * | | | | | add missing newlinePawel Chojnacki2018-03-011-1/+1
| * | | | | | Implement PrometheusDeploymentLocator + fix metrics controllerPawel Chojnacki2018-03-012-21/+28
| * | | | | | use deployment_platform DI in environment and revert changes to k8s cert veri...Pawel Chojnacki2018-02-262-3/+7
| * | | | | | Fix failing test, when deployment platform is not bound to a cluster.Pawel Chojnacki2018-02-261-2/+4
| * | | | | | drop the ! from synchronize_service_state! + remove unused scopePawel Chojnacki2018-02-242-4/+2
| * | | | | | Use deployment platform to find cluster with prometheus applicationPawel Chojnacki2018-02-241-5/+3
| * | | | | | Squashed commit of the following:Pawel Chojnacki2018-02-248-103/+91
* | | | | | | Merge branch 'zj-lazy-parents' into 'master'Douwe Maan2018-03-061-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Lazy fetch parent commits for a commitZeger-Jan van de Weg2018-03-061-2/+5
* | | | | | | | Merge branch 'sh-dashboard-sort-fix' into 'master'Douwe Maan2018-03-061-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix project dashboard showing the wrong timestampssh-dashboard-sort-fixStan Hu2018-03-051-2/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '29130-api-project-export' into 'master'Sean McGivern2018-03-061-1/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | review: rename import_export to import_export_sharedTravis Miller2018-03-051-4/+4
| * | | | | | | review: instantiate shared import/export object in project methodTravis Miller2018-02-281-2/+6
| * | | | | | | Add project export API implementationTravis Miller2018-02-281-3/+2
| * | | | | | | Add project export API entitiesTravis Miller2018-02-281-0/+15
* | | | | | | | Fix Gitaly n+1 in NetworkController#showAndrew Newdigate2018-03-061-6/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'remove-default-scope-from-todos' into 'master'Yorick Peterse2018-03-061-6/+8
|\ \ \ \ \ \ \