summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-091-72/+2
|\
| * Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-061-72/+2
* | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-081-1/+3
|\ \
| * | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-071-1/+3
* | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-0/+4
|\ \ \
| * | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-0/+4
* | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-081-0/+0
|/ / /
* | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-081-3/+5
|\ \ \
| * | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-071-3/+5
| | |/ | |/|
* | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-0/+11
|\ \ \
| * | | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-081-0/+11
* | | | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-083-19/+28
|\ \ \ \
| * | | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-073-19/+28
* | | | | Merge branch 'backport-ee-3892-to-ce' into 'master'Douwe Maan2018-03-071-0/+9
|\ \ \ \ \
| * | | | | Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/mer...backport-ee-3892-to-ceTiago Botelho2018-03-071-0/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-072-1/+65
|\ \ \ \ \
| * | | | | 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 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-071-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-061-2/+3
* | | | | 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