summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-255-10/+21
|
* 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.
* | | | | | | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-221-0/+142
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Profiler for profiling from a console or runner See merge request gitlab-org/gitlab-ce!16552
| * | | | | | | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-191-0/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Profiler.profile takes a URL to profile, and returns the ruby-prof profile result. This is currently only for interactive use (in a console) or from the script runner. Note that when using this interactively, changes to the application within that console session will be used, so this can be used to test proposed performance changes.
* | | | | | | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-221-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
| * | | | | | | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-0/+4
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #42249
* | | | | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ↵Jacob Vosmaer (GitLab)2018-01-222-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull
* | | | | | | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-13/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref See merge request gitlab-org/gitlab-ce!16570
| * | | | | | | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-221-2/+4
| | | | | | | |
| * | | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-181-13/+17
| | | | | | | |
* | | | | | | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-222-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project/#/Members?query= blank causes 500 error" Closes #41673 See merge request gitlab-org/gitlab-ce!16235
| * | | | | | | Fix error on empty query for Members APIMark Fletcher2018-01-212-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'patch-19' into 'master'Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | minor typo fix See merge request gitlab-org/gitlab-ce!16543
| * | | | | | | typo fixBen Bodenmiller2018-01-181-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move rugged-call from Project#write_repository_config to Git::Repository#write_config See merge request gitlab-org/gitlab-ce!16572
| * | | | | | | | _never_ unset gitlab.full_pathgitaly-write-repo-config-prepKim "BKC" Carlbäcker2018-01-191-2/+2
| | | | | | | | |
| * | | | | | | | Move rugged-call from Project#write_repository_config to ↵Kim "BKC" Carlbäcker2018-01-191-0/+4
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Git::Repository#write_config
* | | | | | | | Merge branch ↵Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42231-protected-branches-api-route-returns-404-for-branches-with-dots' into 'master' Resolve "Protected branches API route returns 404 for branches with dots" Closes #42231 See merge request gitlab-org/gitlab-ce!16591
| * | | | | | | Fix protected branches API to accept name parameter with dotMark Fletcher2018-01-191-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-191-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
View Lorry Controller Status