| 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 '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 | ||||
| * | | | 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 | 2 | -6/+6 |
| |\ \ \ | |_|/ |/| | | | | | | | | Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212 | ||||
| | * | | 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 '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 | 1 | -7/+6 |
| |\ \ | | | | | | | | | | | | | 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 | 1 | -7/+6 |
| | | | | |||||
| * | | | 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 | 2 | -3/+49 |
| |/ / | | | | | | | This adds an endpoint to get the common ancestor of 2 refs from the API. | ||||
| * | | CE Port of Protected Environments backend | Mayra Cabrera | 2018-08-10 | 1 | -1/+5 |
| | | | |||||
| * | | 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 | ||||
| * | | | Remove todos of users without access to targets migration | Jarka Kadlecová | 2018-08-07 | 1 | -0/+105 |
| | | | | |||||
| * | | | Merge branch '46535-orphaned-uploads' into 'master' | Kamil Trzciński | 2018-08-07 | 1 | -0/+80 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Rake task for checking orphaned object store uploads Closes #46535 See merge request gitlab-org/gitlab-ce!20918 | ||||
| | * | | Clean orphaned files in object storage | Jarka Kadlecová | 2018-08-07 | 1 | -0/+80 |
| | | | | |||||
| * | | | Resolve "Mutual SSL Auth For Helm TIller" | Mayra Cabrera | 2018-08-07 | 7 | -38/+138 |
| | | | | |||||
| * | | | Backport some changes from gitlab-org/gitlab-ee!6767 | Rubén Dávila | 2018-08-07 | 3 | -3/+30 |
| | | | | |||||
| * | | | Merge branch 'sh-support-bitbucket-server-import' into 'master' | Tim Zallmann | 2018-08-06 | 3 | -9/+373 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Bitbucket Server imports Closes #25393 See merge request gitlab-org/gitlab-ce!20164 | ||||
| | * | | | Remove date from author line since that is already present in `created_at` | Stan Hu | 2018-08-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add a comment when user can't be identified | Stan Hu | 2018-08-02 | 1 | -2/+10 |
| | | | | | |||||
| | * | | | Keep alignment in lib/gitlab/import_sources.rb | Stan Hu | 2018-08-02 | 1 | -9/+9 |
| | | | | | |||||
| | * | | | Revert "Remove unnecessary lookup for merge request SHAs" | Stan Hu | 2018-07-31 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | This reverts commit a9d359b48463c2a77529b9a5f289f9d1abf45484. | ||||
| | * | | | Fix failing spec in fallback diff note change | Stan Hu | 2018-07-31 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Improve formatting of fallback diff note | Stan Hu | 2018-07-31 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Remove unnecessary lookup for merge request SHAs | Stan Hu | 2018-07-31 | 1 | -7/+2 |
| | | | | | |||||
| | * | | | Fix bug where fallback diff notes would not have an associated position | Stan Hu | 2018-07-31 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Handle empty description field | Stan Hu | 2018-07-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Give some context on threaded discussions | Stan Hu | 2018-07-31 | 1 | -1/+9 |
| | | | | | |||||
| | * | | | Fix Rubocop complaint about update_attributes | Stan Hu | 2018-07-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into sh-support-bitbucket-server-import | Stan Hu | 2018-07-31 | 10 | -40/+237 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Fix merge request SHA | Stan Hu | 2018-07-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | No need to look up commit SHA since Bitbucket has a full-length SHA | Stan Hu | 2018-07-30 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | Restrict to confirmed users and allow memoization of unkonwn e-mails | Stan Hu | 2018-07-28 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge branch 'master' into sh-support-bitbucket-server-import | Stan Hu | 2018-07-27 | 19 | -62/+114 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into sh-support-bitbucket-server-import | Stan Hu | 2018-07-25 | 12 | -61/+91 |
| | |\ \ \ \ | |||||
| | * | | | | | Remove merge request deletion code | Stan Hu | 2018-07-20 | 1 | -2/+0 |
| | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |