summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-057-9/+9
|\ | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
| * Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-057-9/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Projects and groups badges APIFrancisco Javier López2018-03-055-0/+86
| |
* | Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-uiRobert Speicher2018-03-051-4/+0
|\ \ | | | | | | | | | | | | | | | | | | Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513
| * | Cleanup after adding MR diff's commit_countJan Provaznik2018-03-051-4/+0
| |/ | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
* | Merge branch 'fix/find-commit-with-empty-rev' into 'master'Robert Speicher2018-03-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Keep note commit around if commit_id is present Closes gitaly#1054 See merge request gitlab-org/gitlab-ce!17496
| * | Keep a commit around if its sha is presentAhmad Sherif2018-03-051-1/+1
| | | | | | | | | | | | Closes gitaly#1054
* | | Merge branch '41616-api-issues-between-date' into 'master'Sean McGivern2018-03-052-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API support for selecting only updated issues before/after a given date" Closes #41616 See merge request gitlab-org/gitlab-ce!17417
| * | | Adds updated_at filter to issues and merge_requests APIJacopo2018-03-052-0/+13
| | | |
* | | | Merge branch 'ee-4862-verify-file-checksums' into 'master'Sean McGivern2018-03-051-0/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Foreground verification of uploads and LFS objects See merge request gitlab-org/gitlab-ce!17402
| * | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksumsNick Thomas2018-03-021-0/+4
| |/ /
* | | Merge branch '42877-fix-visibility-change-performance' into 'master'Yorick Peterse2018-03-022-39/+16
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Revert Project.public_or_visible_to_user changes but apply change to SnippetsFinder Closes #42877 See merge request gitlab-org/gitlab-ce!17476
| * | Extract method User#authorizations_for_projects.42877-fix-visibility-change-performanceAndreas Brandl2018-03-022-12/+13
| | |
| * | Revert Project.public_or_visible_to_user changesYorick Peterse2018-03-021-35/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were introduced in MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17088. In https://gitlab.com/gitlab-com/infrastructure/issues/3772 we discovered these changes lead to a pretty drastic increase in SQL response timings. We'll revert these changes so we can work on a better solution in the mean time without GitLab.com (or other installations) experiecing reduced performance in the mean time.
* | | Merge branch '33570-slack-notify-default-branch' into 'master'Sean McGivern2018-03-021-3/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Slack notifications - Respect "Notify only default branch" for push events Closes #33570 See merge request gitlab-org/gitlab-ce!17345
| * | SlackService - respect `notify_only_default_branch` for push eventsMario de la Ossa2018-03-021-3/+9
| | |
* | | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'Sean McGivern2018-03-021-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456
| * | | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-011-4/+2
| | | | | | | | | | | | | | | | Closes gitaly#1046
* | | | Merge branch 'zj-version-string-grouping-ci' into 'master'Grzegorz Bizon2018-03-021-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Allow CI/CD Jobs being grouped on version strings See merge request gitlab-org/gitlab-ce!17455
| * | | Allow CI/CD Jobs being grouped on version stringsZeger-Jan van de Weg2018-03-011-1/+1
| |/ / | | | | | | | | | | | | This makes grouping on version number available. In general I'd like to group based on MAJOR.MINOR version numbers for Gitaly.
* | | Extend Cluster Applications to install GitLab Runner to Kubernetes clusterMayra Cabrera2018-03-016-13/+109
| | |
* | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-013-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
| * | | Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-283-5/+5
| | | |
* | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master'Douwe Maan2018-03-011-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793
| * | | | Refactors median code to work with both single and multiple projectsTiago Botelho2018-02-281-2/+2
| | | | |
| * | | | Restrict cycle analytics usage data to instances that use postgres onlyTiago Botelho2018-02-281-7/+2
| | | | |
| * | | | Restore memoization to base query and add a batch base query methodTiago Botelho2018-02-281-2/+7
| | | | |
| * | | | Add BatchLoader as a way to refactor the base stage codeTiago Botelho2018-02-281-3/+3
| | | | |
| * | | | Refactor CycleAnalytics base stage class and modelTiago Botelho2018-02-281-1/+1
| | | | |
| * | | | Adds get all medians to Cycle Analytics modelTiago Botelho2018-02-281-0/+6
| | | | |
* | | | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-012-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052
| * | | | | Remove redundant code and increase delay for ↵Dylan Griffith2018-02-251-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | ClusterWaitForIngressIpAddressWorker (#42643)
| * | | | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeDylan Griffith2018-02-235-14/+47
| |\ \ \ \ \
| * | | | | | Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changesDylan Griffith2018-02-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (#42643)
| * | | | | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeFilipa Lacerda2018-02-204-7/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Docs: Pages - clean up articles Only use features for events Put all event metrics exposed to prometheus behind a feature flag Add version which LFS lock was introduced Remove unecessary validate: true from belongs_to :project fix broken specs remove common_d3 bundle remove graphs_show webpack bundle Chart.html.haml refactor Remove extraneous tests from Issues API spec [GH Import] Create an empty wiki if wiki import failed Resolve "group request membership mail with too long list of "To:"" Add changelog entry Fix single digit value clipping specify date format Increase feature flag cache TTL to one hour Convert Gitaly commit parent IDs to array as early as possible Clarify changelog for squash encoding fix Avoid slow File Lock checks when not used Fix squash rebase not working when diff contained encoded data ...
| * | | | | | | Schedule Ingress IP address fetch from K8s after clusters page load (#42643)Dylan Griffith2018-02-202-0/+13
| | | | | | | |
| * | | | | | | Refactor ingress IP address waiting code (#42643)Dylan Griffith2018-02-202-9/+10
| | | | | | | |
| * | | | | | | [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-02-195-45/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42643-persist-external-ip-of-ingress-controller-gke * master: (114 commits) Fix Error 500 when viewing a commit with a GPG signature in Geo Remember assignee when moving an issue Add changelog entry Allow oxford commas and spaces before commas in MR issue closing pattern. Don't cache a nil repository root ref to prevent caching issues Add back database changes for Ci::Build Revert "Merge branch 'expired-ci-artifacts' into 'master'" Fix order dependencies in some specs migrate admin:users:* to static bundle correct for missing break statement in dispatcher.js alias create and update actions to new and edit migrate projects:merge_requests:edit to static bundle migrate projects:merge_requests:creations:diffs to static bundle migrate projects:merge_requests:creations:new to static bundle migrate projects:issues:new and projects:issues:edit to static bundle migrate projects:branches:index to static bundle migrate projects:branches:new to static bundle migrate projects:compare:show to static bundle migrate projects:environments:metrics to static bundle migrate projects:milestones:* and groups:milestones:* to static bundle ...
| * | | | | | | | Persist external IP of ingress controller created for GKE (#42643)Dylan Griffith2018-02-152-0/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-licensee-key' into 'master'43548-update-language-about-usage-ping-in-admin-settings-and-docsSean McGivern2018-03-011-9/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client implementation for Licensee#key See merge request gitlab-org/gitlab-ce!17449
| * | | | | | | | | Client implementation for Licensee#keyZeger-Jan van de Weg2018-03-011-9/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Part of the migration as tracked in: gitlab-org/gitaly#1026
* | | | | | | | | Merge branch '42434-allow-commits-endpoint-to-work-over-all-commits' into ↵Douwe Maan2018-03-011-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Allow API method /projects/:id/repository/commits to work over all commits" Closes #42434 See merge request gitlab-org/gitlab-ce!17182
| * | | | | | | | API method /projects/:id/repository/commits now works over every commitTiago Botelho2018-02-231-2/+3
| | | | | | | | |
* | | | | | | | | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-281-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display IP Address Of Runner On Runner Page" Closes #43489 See merge request gitlab-org/gitlab-ce!17286
| * | | | | | | | Persist runner IP address on contact (#43489)Dylan Griffith2018-02-281-2/+2
| | | | | | | | |
* | | | | | | | | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-281-0/+1
|/ / / / / / / /
* | | | | | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-272-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '43304-simplify-filtering-non-human-users' into 'master'Yorick Peterse2018-02-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify filtering of non-human users. Closes #43304 See merge request gitlab-org/gitlab-ce!17288
| * | | | | | | | Simplify filtering of non-human users (like ghosts).43304-simplify-filtering-non-human-usersAndreas Brandl2018-02-261-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that `ghost IS NOT TRUE` is equivalent to `ghost = 'f' OR ghost is null`: (true), (false), (NULL)) AS t (flag); flag | ?column? | ?column? ------+----------+---------- t | f | f f | t | t | t | t (3 rows) This makes it a little easier to create partial indexes for this (as only one condition is needed). Closes #43304.