summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Avoid process deadlock in popen by consuming input pipessh-fix-stderr-pipe-consumptionStan Hu2018-07-122-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A process that spews a lot of output to stderr or stdout could stall out due to the pipe buffer being full. As described in https://bugs.ruby-lang.org/issues/9082, we can use the trick used in Ruby's capture3 function to read the pipes in separate threads. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6895
* | | | | | | | | Merge branch 'gitaly-mandatory-20180712-jv' into 'master'Sean McGivern2018-07-131-140/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make more ref RPC's mandatory Closes gitaly#526, gitaly#965, gitaly#476, and gitaly#474 See merge request gitlab-org/gitlab-ce!20592
| * | | | | | | | Fix find_branch call sitesgitaly-mandatory-20180712-jvJacob Vosmaer2018-07-121-1/+1
| | | | | | | | |
| * | | | | | | | Make more ref RPC's mandatoryJacob Vosmaer2018-07-121-139/+22
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-performance-problem-of-tags-query' into 'master'Yorick Peterse2018-07-121-4/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance problem of tags query Closes gitlab-com/infrastructure#4550 See merge request gitlab-org/gitlab-ce!20555
| * | | | | | | | Fix performance problem of accessing tag list for projects api endpointsfix-performance-problem-of-tags-queryKamil Trzciński2018-07-121-4/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-124-2/+125
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304
| * | | | | | | | | Improve manifest feature after backend reviewDmitriy Zaporozhets2018-07-112-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Refactor manifest import codeDmitriy Zaporozhets2018-07-111-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add feature specs for manifest importDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Fix icon for manifest import and mention manifest feature in APIDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Improve manifest import logicDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | More reliable manifest parser and group-only selectorDmitriy Zaporozhets2018-07-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Fix tests in import_sources_spec.rbDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add manifest import featureDmitriy Zaporozhets2018-07-113-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows user to automatically import multiple repositories with nested structure by uploading a manifest xml file. AOSP project was used as an example during development of this feature. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'gitaly-serverservice-info-timeout' into 'master'Rémy Coutable2018-07-122-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a fast_timeout for the `ServerService.ServerInfo` endpoint Closes #49116 See merge request gitlab-org/gitlab-ce!20552
| * | | | | | | | | | Add a fast_timeout for the `ServerService.ServerInfo` endpointgitaly-serverservice-info-timeoutAndrew Newdigate2018-07-112-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Remove Repository#path memoizationJacob Vosmaer (GitLab)2018-07-122-39/+15
| | | | | | | | | | |
* | | | | | | | | | | Resolve "do not set updated_at when creating note"Kia Mei Somabes2018-07-121-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-111-9/+4
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* | | | | | | | | | Merge branch 'fix-no-method-error-on-nil' into 'master'Kamil Trzciński2018-07-111-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an exception seen using the online terminal See merge request gitlab-org/gitlab-ce!18299
| * | | | | | | | | Fix an exception seen using the online terminalNick Thomas2018-07-111-1/+6
| | | | | | | | | |
* | | | | | | | | | Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-115-16/+18
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-back-mr-diff-deletion-migration' into 'master'Yorick Peterse2018-07-112-25/+105
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add back MR diff deletion migration See merge request gitlab-org/gitlab-ce!20331
| * | | | | | | | | | Use schedulers and delete diff files upon deadtuples checkOswaldo Ferreira2018-07-102-32/+60
| | | | | | | | | | |
| * | | | | | | | | | Remove unnecessary EachBatchOswaldo Ferreira2018-07-101-4/+0
| | | | | | | | | | |
| * | | | | | | | | | Reschedule DeleteDiffFiles until there is none left to removeOswaldo Ferreira2018-07-101-27/+36
| | | | | | | | | | |
| * | | | | | | | | | Wait postgresql vacuum of deadtuples on merge_request_diff_files deletionOswaldo Ferreira2018-07-102-86/+58
| | | | | | | | | | |
| * | | | | | | | | | Add 1000 files per minute deletion ratio on schedulerOswaldo Ferreira2018-07-102-15/+58
| | | | | | | | | | |
| * | | | | | | | | | Create a diff deletion worker scheduler to avoid long-running post-migrationOswaldo Ferreira2018-07-101-0/+32
| | | | | | | | | | |
* | | | | | | | | | | Remove last flags from Blob and WorkhorseJacob Vosmaer2018-07-112-104/+9
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '46519-remove-ce-prefix-suffix-in-check-ce' into 'master'bjk/health_helpRémy Coutable2018-07-111-8/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ee_compat_check should remove `ce-` prefix or `-ce` suffix as ee-specific check" Closes #46519 See merge request gitlab-org/gitlab-ce!20532
| * | | | | | | | | | Find the EE branch by searching the branchesLin Jen-Shin2018-07-111-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses a similar approach in ee_specific_check.rb
* | | | | | | | | | | Add missing maximum_timeout parametergfyoung2018-07-111-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'rails5-autoload' into 'master'Sean McGivern2018-07-111-1/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Permit concurrent loads Closes #48263 See merge request gitlab-org/gitlab-ce!20473
| * | | | | | | | | | [Rails5] Permit concurrent loadsJan Provaznik2018-07-101-1/+11
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5 introduced a new (and safer) autoload mechanism which uses locking when loading missing constants. Under some circumstances it's possible that a deadlock occurs in multi-threaded environment (especially when running capybara tests) To avoid these deadlocks, concurrent load is enabled when loading policies - we ere hitting timeout in this case: https://gitlab.com/gitlab-org/gitlab-ce/issues/48263 Note that autoloading is enabled only in development or test envs (not in production).
* | | | | | | | | | Merge branch 'sh-handle-colons-in-url-passwords' into 'master'James Lopez2018-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle colons in URL passwords Closes #49080 See merge request gitlab-org/gitlab-ce!20538
| * | | | | | | | | Properly handle colons in URL passwordsStan Hu2018-07-101-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before b46d5b13ecb8e0c0793fa433bff7f49cb0612760, we relied on `Addressable::URI` to parse the username/password in a URL, but this failed when credentials contained special characters. However, this introduced a regression where the parsing would incorrectly truncate the password if the password had a colon. Closes #49080
* | | | | | | | | Remove timestamps from `locale/gitlab.pot`Bob Van Landuyt2018-07-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help us avoid conflicts when regenerating the pot file, the timestamps aren't used by Crowdin.
* | | | | | | | | Merge branch 'fix-conflicts-exception-for-submodules' into 'master'Rémy Coutable2018-07-101-4/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure ConflictsService does not raise for conflicting submodules See merge request gitlab-org/gitlab-ce!20528
| * | | | | | | | | Make sure ConflictsService does not raise for conflicting submodulesSean McGivern2018-07-101-4/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch ↵Robert Speicher2018-07-101-7/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master' Backport some changes from EE See merge request gitlab-org/gitlab-ce!20388
| * | | | | | | | Backport some changes from EERubén Dávila2018-07-091-7/+13
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '49057-fix-repository-typo' into 'master'Rémy Coutable2018-07-101-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix a typo in Gitlab::Git::Repository See merge request gitlab-org/gitlab-ce!20520
| * | | | | | | Fix a typo? gitaly_operation{-s-}_clientLin Jen-Shin2018-07-101-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'gitaly-mandatory-20180709-jv' into 'master'Douwe Maan2018-07-102-53/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly for fetches and creating bundles Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665 See merge request gitlab-org/gitlab-ce!20490
| * | | | | | | | Use Gitaly for fetches and creating bundlesJacob Vosmaer2018-07-092-53/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'improve-metadata-access-performance' into 'master'Grzegorz Bizon2018-07-103-201/+208
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Improve metadata access performance See merge request gitlab-org/gitlab-ce!20493
| * | | | | | | | Access metadata directly from Object StorageKamil Trzciński2018-07-093-201/+208
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Previously we would pull the file, now, we just stream-it as needed from Object Storage
* | | | | | | | Merge branch '48537-update-avatar-only-via-api' into 'master'Rémy Coutable2018-07-101-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "PUT /projects/:id : unable to update avatar alone" Closes #48537 See merge request gitlab-org/gitlab-ce!20505