| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'blacklist-destroy-all' into 'master' | Robert Speicher | 2018-08-17 | 1 | -1/+1 |
| |\ | | | | | | | | | Blacklist the use of destroy_all See merge request gitlab-org/gitlab-ce!21250 | ||||
| | * | Whitelist existing destroy_all offensesblacklist-destroy-all | Yorick Peterse | 2018-08-16 | 1 | -1/+1 |
| | | | | | | | | | This whitelists all existing places where we use "destroy_all". | ||||
| * | | Merge branch 'ab-49754-gh-importer-internal-ids' into 'master' | Yorick Peterse | 2018-08-17 | 4 | -4/+26 |
| |\ \ | | | | | | | | | | | | | | | | | | | GitHub importer: Keep track of internal_ids Closes #49754 See merge request gitlab-org/gitlab-ce!20926 | ||||
| | * | | Trigger iid logic from GitHub importer for merge requests. | Andreas Brandl | 2018-08-16 | 1 | -1/+7 |
| | | | | |||||
| | * | | Trigger iid logic from GitHub importer for milestones. | Andreas Brandl | 2018-08-16 | 2 | -2/+14 |
| | | | | |||||
| | * | | Trigger iid logic from GitHub importer for issues. | Andreas Brandl | 2018-08-16 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'repopulate_site_statistics' into 'master' | Yorick Peterse | 2018-08-17 | 1 | -0/+23 |
| |\ \ \ | | | | | | | | | | | | | | | | | Fix SiteStatistics wikis_count See merge request gitlab-org/gitlab-ce!21030 | ||||
| | * | | | Refactor SiteStatistics to extract refresh logic into a rake task | Gabriel Mazetto | 2018-08-16 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | Merge branch 'zj-user-update-branch' into 'master' | Douwe Maan | 2018-08-17 | 1 | -8/+2 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Remove feature flags for UserUpdateBranch Closes gitaly#1246 and gitaly#1310 See merge request gitlab-org/gitlab-ce!21238 | ||||
| | * | | | Remove feature flags for UserUpdateBranch | Zeger-Jan van de Weg | 2018-08-16 | 1 | -8/+2 |
| | |/ / | | | | | | | | | | | | | | | | | | | This has been tested on .com. So far no errors have been seen. Closes https://gitlab.com/gitlab-org/gitaly/issues/1310 Closes https://gitlab.com/gitlab-org/gitaly/issues/1246 | ||||
| * | | | Add rake command to migrate archived traces from local storage to object storage | Shinya Maeda | 2018-08-16 | 1 | -0/+17 |
| | | | | |||||
| * | | | Merge branch 'zj-remove-flags-find-all-brances' into 'master'50326-ocd-pipeline | Sean McGivern | 2018-08-16 | 1 | -28/+1 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Remove feature flag for FindAllRemoteBranches Closes gitaly#1243 See merge request gitlab-org/gitlab-ce!21234 | ||||
| | * | | Remove feature flag for FindAllRemoteBranches | Zeger-Jan van de Weg | 2018-08-16 | 1 | -28/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acceptance testing done through: https://gitlab.com/gitlab-org/gitaly/issues/1312 Relatively short AT period, but given its not a hard RPC, nor anything funky is going on, I felt that this was decent enough to remove the feature flag. Closes https://gitlab.com/gitlab-org/gitaly/issues/1243 | ||||
| * | | | Merge branch 'backport-5986-license-templates' into 'master' | Robert Speicher | 2018-08-15 | 4 | -37/+21 |
| |\ \ \ | |_|/ |/| | | | | | | | | Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212 | ||||
| | * | | Convert the license template API to use the new LicenseTemplateFinder | Nick Thomas | 2018-08-15 | 2 | -31/+15 |
| | | | | |||||
| | * | | Fix bugs in Gitlab::Template::Finders preventing instances from ↵ | Nick Thomas | 2018-08-14 | 2 | -6/+6 |
| | |/ | | | | | | | BaseTemplate.all from loading content | ||||
| * | | Merge branch 'bvl-add-czech' into 'master' | Sean McGivern | 2018-08-15 | 1 | -1/+2 |
| |\ \ | |/ |/| | | | | | | | | | Add Czech as an available language Closes #43227 See merge request gitlab-org/gitlab-ce!21201 | ||||
| | * | Add Czech as an available language | Bob Van Landuyt | 2018-08-15 | 1 | -1/+2 |
| | | | | | | | | | New translations added to `locale/cs_CZ` will automatically be picked up. | ||||
| * | | Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master' | Kamil Trzciński | 2018-08-14 | 2 | -2/+8 |
| |\ \ | | | | | | | | | | | | | Expose all artifacts sizes in jobs api See merge request gitlab-org/gitlab-ce!20821 | ||||
| | * | | Expose all artifacts sizes in jobs api | Peter Marko | 2018-08-14 | 2 | -2/+8 |
| | |/ | |||||
| * | | Merge branch 'ee-5863-customize-notifications-for-new-epic' into 'master' | Grzegorz Bizon | 2018-08-14 | 2 | -4/+6 |
| |\ \ | | | | | | | | | | | | | Backport of EE changes "Customize notifications for new epic - Web and API" See merge request gitlab-org/gitlab-ce!20793 | ||||
| | * | | Allow global event list containing all events | Mark Chao | 2018-08-14 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | This way we can globally set group only ee events too. Use nil to indicate global. | ||||
| | * | | Add email_events to replace EMAIL_EVENTS because it needs to be dynamic, | Mark Chao | 2018-08-14 | 2 | -3/+3 |
| | | | | | | | | | | allowing override for EE. | ||||
| * | | | Merge branch 'zj-remove-feature-gate-list-commits' into 'master' | Douwe Maan | 2018-08-14 | 1 | -11/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature gate for ListNewCommits Closes gitaly#1286 and gitaly#1233 See merge request gitlab-org/gitlab-ce!21184 | ||||
| | * | | | Remove feature gate for ListNewCommits | Zeger-Jan van de Weg | 2018-08-14 | 1 | -11/+2 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20087, this has been tested on .com now, and is stable. Closes https://gitlab.com/gitlab-org/gitaly/issues/1286 Closes https://gitlab.com/gitlab-org/gitaly/issues/1233 | ||||
| * | | | Merge branch 'gitaly-install-path' into 'master' | Douwe Maan | 2018-08-14 | 2 | -25/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove storage path dependency of gitaly install task See merge request gitlab-org/gitlab-ce!21101 | ||||
| | * | | | Remove storage path dependency of gitaly install task | Alejandro Rodríguez | 2018-08-12 | 2 | -25/+12 |
| | | | | | |||||
| * | | | | Merge branch '48967-disable-statement-timeout' into 'master' | Douwe Maan | 2018-08-14 | 1 | -30/+73 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | `disable_statement_timeout` will no longer leak to other migrations Closes #48967 See merge request gitlab-org/gitlab-ce!20503 | ||||
| | * | | | disable_statement_timeout doesn't require any argument anymore | Gabriel Mazetto | 2018-08-11 | 1 | -27/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it will decide the method for disable statement_timeout upon per transaction or per session, based on how it's called. When calling with a block, block will be executed and it will use session based statement_timeout, otherwise will default to existing behavior. | ||||
| | * | | | MigrationHelper `disable_statement_timeout` accepts `transaction: false` | Gabriel Mazetto | 2018-08-10 | 1 | -31/+75 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | By default statement_timeout will only be enabled during transaction lifetime, therefore not leaking outside of it. With `transaction: false` it will set for entire session, but requires a block to passed. It yields control and cleans up session after block finishes, also preventing leaking outside of it. | ||||
| * | | | Get the `merge-base` of 2 refs trough the API | Bob Van Landuyt | 2018-08-13 | 3 | -3/+82 |
| |/ / | | | | | | | This adds an endpoint to get the common ancestor of 2 refs from the API. | ||||
| * | | Merge branch 'add-frozen-string-literal-to-community-contribution-files' ↵ | Robert Speicher | 2018-08-10 | 2 | -0/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | into 'master' Add frozen_string_literal to recently-added files from the community See merge request gitlab-org/gitlab-ce!21132 | ||||
| | * | | Add frozen_string_literal to recently-added files from the community | Sean McGivern | 2018-08-10 | 2 | -0/+4 |
| | | | | |||||
| * | | | CE Port of Protected Environments backend | Mayra Cabrera | 2018-08-10 | 1 | -1/+5 |
| |/ / | |||||
| * | | Merge branch '28930-add-project-reference-filter' into 'master' | Sean McGivern | 2018-08-10 | 3 | -0/+144 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "GFM : provide 'project' reference in comment" Closes #28930 See merge request gitlab-org/gitlab-ce!20285 | ||||
| | * | | Use a hash to memoize readable_project_ids with user objects as keys | Reuben Pereira | 2018-07-31 | 1 | -6/+5 |
| | | | | |||||
| | * | | Remove nodes_visible_to_user from ProjectParser and memoize readable_project_ids | Reuben Pereira | 2018-07-15 | 1 | -17/+10 |
| | | | | |||||
| | * | | Use map instead of collect in the ProjectParser#projects_readable_by_user ↵ | Reuben Pereira | 2018-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | function | ||||
| | * | | Add back the Project#to_reference_with_postfix function since it can be used ↵ | Reuben Pereira | 2018-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | in the ProjectReferenceFilter#link_to_project function | ||||
| | * | | Use a custom ProjectParser#nodes_visible_to_user function so that the user ↵ | Reuben Pereira | 2018-07-05 | 1 | -2/+21 |
| | | | | | | | | | | | | | permissions for all project references can be checked together | ||||
| | * | | Correct the comment above the ProjectReferenceFilter.references_in method. | Reuben Pereira | 2018-07-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Eager load a project's route and its namespace with route in ↵ | Reuben Pereira | 2018-07-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | project_reference_filter | ||||
| | * | | Eager load the namespace and route of a project in project_reference_filter.rb | Reuben Pereira | 2018-07-03 | 1 | -1/+2 |
| | | | | |||||
| | * | | Correct the comments above the ProjectReferenceFilter#project_link_filter ↵ | Reuben Pereira | 2018-07-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | function to make it clear that the full project path is required in a reference. | ||||
| | * | | Correct the misleading name of a variable in ↵ | Reuben Pereira | 2018-07-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | ProjectReferenceFilter.project_link_filter | ||||
| | * | | Correct the comment above the projects_hash function in the ↵ | Reuben Pereira | 2018-06-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | project_reference_filter | ||||
| | * | | A working implementation of a project reference filter which links project ↵ | Reuben Pereira | 2018-06-30 | 3 | -0/+132 |
| | | | | | | | | | | | | | references to project profile. | ||||
| * | | | Backport of gitlab-org/gitlab-ee!6848 | Rubén Dávila | 2018-08-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'sh-fix-bitbucket-cloud-importer-replies' into 'master' | Robert Speicher | 2018-08-08 | 1 | -10/+13 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bitbucket Cloud importer omitting replies Closes #50052 See merge request gitlab-org/gitlab-ce!21076 | ||||
| | * | | | Fix Bitbucket Cloud importer omitting replies | Stan Hu | 2018-08-07 | 1 | -10/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline diff comments did not have the proper position, so even though they had line codes the merge request validation would fail. Now we cache the line position for each parent comment and use that. Closes #50052 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |