summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-remove-flags-find-all-brances' into 'master'50326-ocd-pipelineSean McGivern2018-08-161-28/+1
|\ | | | | | | | | | | | | Remove feature flag for FindAllRemoteBranches Closes gitaly#1243 See merge request gitlab-org/gitlab-ce!21234
| * Remove feature flag for FindAllRemoteBranchesZeger-Jan van de Weg2018-08-161-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 Speicher2018-08-154-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 LicenseTemplateFinderNick Thomas2018-08-152-31/+15
| | |
| * | Fix bugs in Gitlab::Template::Finders preventing instances from ↵Nick Thomas2018-08-142-6/+6
| |/ | | | | | | BaseTemplate.all from loading content
* | Merge branch 'bvl-add-czech' into 'master'Sean McGivern2018-08-151-1/+2
|\ \ | |/ |/| | | | | | | | | Add Czech as an available language Closes #43227 See merge request gitlab-org/gitlab-ce!21201
| * Add Czech as an available languageBob Van Landuyt2018-08-151-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ński2018-08-142-2/+8
|\ \ | | | | | | | | | | | | Expose all artifacts sizes in jobs api See merge request gitlab-org/gitlab-ce!20821
| * | Expose all artifacts sizes in jobs apiPeter Marko2018-08-142-2/+8
| |/
* | Merge branch 'ee-5863-customize-notifications-for-new-epic' into 'master'Grzegorz Bizon2018-08-142-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 eventsMark Chao2018-08-141-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 Chao2018-08-142-3/+3
| | | | | | | | | allowing override for EE.
* | | Merge branch 'zj-remove-feature-gate-list-commits' into 'master'Douwe Maan2018-08-141-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 ListNewCommitsZeger-Jan van de Weg2018-08-141-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 Maan2018-08-142-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 taskAlejandro Rodríguez2018-08-122-25/+12
| | | |
* | | | Merge branch '48967-disable-statement-timeout' into 'master'Douwe Maan2018-08-141-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 anymoreGabriel Mazetto2018-08-111-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 Mazetto2018-08-101-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 APIBob Van Landuyt2018-08-133-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 Speicher2018-08-102-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 communitySean McGivern2018-08-102-0/+4
| | |
* | | CE Port of Protected Environments backendMayra Cabrera2018-08-101-1/+5
|/ /
* | Merge branch '28930-add-project-reference-filter' into 'master'Sean McGivern2018-08-103-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 keysReuben Pereira2018-07-311-6/+5
| | |
| * | Remove nodes_visible_to_user from ProjectParser and memoize readable_project_idsReuben Pereira2018-07-151-17/+10
| | |
| * | Use map instead of collect in the ProjectParser#projects_readable_by_user ↵Reuben Pereira2018-07-051-1/+1
| | | | | | | | | | | | function
| * | Add back the Project#to_reference_with_postfix function since it can be used ↵Reuben Pereira2018-07-051-1/+1
| | | | | | | | | | | | in the ProjectReferenceFilter#link_to_project function
| * | Use a custom ProjectParser#nodes_visible_to_user function so that the user ↵Reuben Pereira2018-07-051-2/+21
| | | | | | | | | | | | permissions for all project references can be checked together
| * | Correct the comment above the ProjectReferenceFilter.references_in method.Reuben Pereira2018-07-031-1/+1
| | |
| * | Eager load a project's route and its namespace with route in ↵Reuben Pereira2018-07-031-1/+1
| | | | | | | | | | | | project_reference_filter
| * | Eager load the namespace and route of a project in project_reference_filter.rbReuben Pereira2018-07-031-1/+2
| | |
| * | Correct the comments above the ProjectReferenceFilter#project_link_filter ↵Reuben Pereira2018-07-031-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 Pereira2018-07-031-3/+3
| | | | | | | | | | | | ProjectReferenceFilter.project_link_filter
| * | Correct the comment above the projects_hash function in the ↵Reuben Pereira2018-06-301-3/+3
| | | | | | | | | | | | project_reference_filter
| * | A working implementation of a project reference filter which links project ↵Reuben Pereira2018-06-303-0/+132
| | | | | | | | | | | | references to project profile.
* | | Backport of gitlab-org/gitlab-ee!6848Rubén Dávila2018-08-081-1/+1
| | |
* | | Merge branch 'sh-fix-bitbucket-cloud-importer-replies' into 'master'Robert Speicher2018-08-081-10/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Bitbucket Cloud importer omitting replies Closes #50052 See merge request gitlab-org/gitlab-ce!21076
| * | | Fix Bitbucket Cloud importer omitting repliesStan Hu2018-08-071-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
* | | | Backport issue board milestone lists EE changesOswaldo Ferreira2018-08-073-9/+19
| | | |
* | | | Merge branch 'todos-visibility-migration' into 'master'Sean McGivern2018-08-071-0/+105
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove todos of users without access to targets (migration) See merge request gitlab-org/gitlab-ce!20927
| * | | | Remove todos of users without access to targets migrationJarka Kadlecová2018-08-071-0/+105
| | | | |
* | | | | Create Web IDE MR and branch pickerPaul Slaughter2018-08-071-0/+1
|/ / / /
* | | | Merge branch '46535-orphaned-uploads' into 'master'Kamil Trzciński2018-08-072-0/+90
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Rake task for checking orphaned object store uploads Closes #46535 See merge request gitlab-org/gitlab-ce!20918
| * | | Clean orphaned files in object storageJarka Kadlecová2018-08-072-0/+90
| | | |
* | | | Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-077-38/+138
| | | |
* | | | Merge branch 'group-todos' into 'master'Sean McGivern2018-08-071-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Group todos See merge request gitlab-org/gitlab-ce!20675
| * | | | Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-021-4/+9
| | | | | | | | | | | | | | | | | | | | This reverts commit 8717c7dad9b5a8fa21ec9a652c54718a6b4c2175.
* | | | | Backport some changes from gitlab-org/gitlab-ee!6767Rubén Dávila2018-08-073-3/+30
| | | | |
* | | | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-0614-9/+1152
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Bitbucket Server imports Closes #25393 See merge request gitlab-org/gitlab-ce!20164
View Lorry Controller Status