summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Don't allow Repository#log with limit zeroJacob Vosmaer (GitLab)2018-01-291-1/+5
|
* Merge branch 'improve_nginx_confs' into 'master'Rémy Coutable2018-01-292-0/+8
|\ | | | | | | | | Improve Nginx configuration files See merge request gitlab-org/gitlab-ce!16605
| * Add omnibus remarksMelroy van den Berg2018-01-262-0/+8
| |
* | Merge branch 'sh-mute-notifications-seeder' into 'master'Rémy Coutable2018-01-291-0/+10
|\ \ | | | | | | | | | | | | Mute notifications in the seeder to speed GDK development See merge request gitlab-org/gitlab-ce!16747
| * | Mute notifications in the seeder to speed GDK developmentsh-mute-notifications-seederStan Hu2018-01-261-0/+10
| | |
* | | Set alternate object directories in run_gitJacob Vosmaer (GitLab)2018-01-293-23/+35
| | |
* | | Merge branch '42290-pass-BUNDLE_PATH' into 'master'Rémy Coutable2018-01-291-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "Make tests running bundle install for gitaly more flexible" Closes #42290 See merge request gitlab-org/gitlab-ce!16654
| * | Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATHLin Jen-Shin2018-01-261-1/+5
| | |
* | | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-261-1/+6
| | |
* | | disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-261-1/+1
|/ /
* | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-254-6/+39
|\ \ | | | | | | | | | | | | | | | | | | Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
| * | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-244-6/+39
| | | | | | | | | | | | Closes gitaly#946
* | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-255-10/+21
|\ \ \ | | | | | | | | | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-255-10/+21
| | | |
* | | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-251-17/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#run_git private See merge request gitlab-org/gitlab-ce!16622
| * | | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-251-17/+82
| | | | |
* | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-252-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix .batch_lfs_pointers accepting a lazy enumerator See merge request gitlab-org/gitlab-ce!16701
| * | | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-252-3/+3
| |/ / / /
* | | | | Make Gitaly RepositoryExists opt-outJacob Vosmaer (GitLab)2018-01-251-1/+1
| |/ / / |/| | |
* | | | Merge branch 'revert-9f5390d8' into 'master'Marin Jankovski2018-01-251-10/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" See merge request gitlab-org/gitlab-ce!16707
| * | | | Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"Douwe Maan2018-01-251-10/+1
| | | | | | | | | | | | | | | This reverts merge request !16626
* | | | | Merge branch 'revert-430b3f0e' into 'master'Douwe Maan2018-01-251-1/+26
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Revert "Merge branch 'remove-rugged-walk' into 'master'" See merge request gitlab-org/gitlab-ce!16676
| * | | | Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0eJacob Vosmaer (GitLab)2018-01-251-1/+26
| |/ / / | | | | | | | | This reverts merge request !16525
* | | | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-254-38/+92
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
| * | | Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-244-38/+92
| | | |
* | | | Merge branch ↵Rémy Coutable2018-01-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
| * | | | Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-231-2/+2
| | | | | | | | | | | | | | | | | | | | when counting commit count.
* | | | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-243-3/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable Geo to skip shards that not operational. Relates to gitlab-org/gitlab-ee#4329
* | | | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
| * | | | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | Related to #39805
* | | | | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-244-21/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
| * | | | | Use limit for search count queriessearch-100Jan Provaznik2018-01-234-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | | | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-243-7/+39
| |/ / / / |/| | | | | | | | | | | | | | Closes gitaly#921
* | | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'Robert Speicher2018-01-245-6/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate repository bundling to Gitaly Closes gitaly#929 See merge request gitlab-org/gitlab-ce!16563
| * | | | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-245-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#929
* | | | | | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-241-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626
| * | | | | | Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-231-1/+10
| | | | | | |
* | | | | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-243-0/+38
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add application create API Closes #24035 See merge request gitlab-org/gitlab-ce!16643
| * | | | | | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-applicationToon Claes2018-01-242-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it more clear to developers that the entity exposes the application secret, define a separate entity that only should be used when the secret is needed (probably only on creation).
| * | | | | | Add documentation about when the application API was addedToon Claes2018-01-241-0/+1
| | | | | | |
| * | | | | | Add application create APINicolas MERELLI2018-01-243-0/+33
| | |/ / / / | |/| | | |
* | | | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts ↵fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-231-0/+5
|/ / / / / | | | | | | | | | | | | | | | with missing side
* | | | | Merge branch 'dm-push-rule-regexp-error-ce' into 'master'Douwe Maan2018-01-231-17/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes to Gitlab::Checks::ChangeAccess from EE See merge request gitlab-org/gitlab-ce!16652
| * | | | | Backport changes to Gitlab::Checks::ChangeAccess from EEDouwe Maan2018-01-231-17/+21
| | | | | |
* | | | | | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-232-5/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPC Closes gitaly#936 See merge request gitlab-org/gitlab-ce!16536
| * | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-222-5/+46
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-232-25/+113
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-222-25/+113
| | | | | |
* | | | | | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-221-20/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use has_table_privilege for TRIGGER on PostgreSQL Closes #38634 See merge request gitlab-org/gitlab-ce!16618
| * | | | | | Use has_table_privilege for TRIGGER on PostgreSQLfix-postgresql-table-grantYorick Peterse2018-01-221-20/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38634.
View Lorry Controller Status