Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove Rugged exception in cache rescuerugged-reference-cache-rescue | Jacob Vosmaer | 2018-01-30 | 1 | -0/+2 |
| | |||||
* | Decouple more of Repository from Rugged | Jacob Vosmaer (GitLab) | 2018-01-30 | 3 | -20/+76 |
| | |||||
* | Merge branch '41972-make-sure-no-warnings' into 'master' | Robert Speicher | 2018-01-29 | 19 | -81/+135 |
|\ | | | | | | | | | | | | | Fail static-analysis if there's output to stderr Closes #41972 See merge request gitlab-org/gitlab-ce!16648 | ||||
| * | Use Process::Status rather than an integer | Lin Jen-Shin | 2018-01-26 | 2 | -9/+9 |
| | | | | | | | | However keep backward compatibility | ||||
| * | Fix rubocop offenses. It's not checked before when | Lin Jen-Shin | 2018-01-26 | 1 | -5/+4 |
| | | | | | | | | it's inside lib/tasks/* | ||||
| * | Eliminate the last warning for redis wrapper | Lin Jen-Shin | 2018-01-26 | 1 | -1/+1 |
| | | |||||
| * | We need Rails in order to use Gitlab.config anyway | Lin Jen-Shin | 2018-01-26 | 1 | -3/+0 |
| | | |||||
| * | Eliminate the warnings for database | Lin Jen-Shin | 2018-01-26 | 1 | -11/+9 |
| | | |||||
| * | Eliminate the warnings from task helpers | Lin Jen-Shin | 2018-01-26 | 12 | -53/+45 |
| | | |||||
| * | Convert parser warnings to stdout in haml_lint | Lin Jen-Shin | 2018-01-26 | 1 | -0/+9 |
| | | | | | | | | | | So we ignore it in static-analysis when status is 0, yet still report it if it's not. | ||||
| * | Ignore flay warnings | Lin Jen-Shin | 2018-01-26 | 1 | -1/+1 |
| | | |||||
| * | Fail static-analysis if there's output to stderr | Lin Jen-Shin | 2018-01-26 | 2 | -5/+64 |
| | | | | | | | | TODO: fix offenders | ||||
* | | Merge branch 'osw-consistent-values-on-api-merge-status' into 'master' | Douwe Maan | 2018-01-29 | 1 | -1/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | Return more consistent values for merge_status on MR API Closes #20639 See merge request gitlab-org/gitlab-ce!16708 | ||||
| * | | Remove tap and use simplified method call | Oswaldo Ferreira | 2018-01-29 | 1 | -1/+2 |
| | | | |||||
| * | | Return more consistent values for merge_status on MR APIosw-consistent-values-on-api-merge-status | Oswaldo Ferreira | 2018-01-28 | 1 | -1/+8 |
| | | | |||||
* | | | Don't allow Repository#log with limit zero | Jacob Vosmaer (GitLab) | 2018-01-29 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'improve_nginx_confs' into 'master' | Rémy Coutable | 2018-01-29 | 2 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Improve Nginx configuration files See merge request gitlab-org/gitlab-ce!16605 | ||||
| * | | | Add omnibus remarks | Melroy van den Berg | 2018-01-26 | 2 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'sh-mute-notifications-seeder' into 'master' | Rémy Coutable | 2018-01-29 | 1 | -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-seeder | Stan Hu | 2018-01-26 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Set alternate object directories in run_git | Jacob Vosmaer (GitLab) | 2018-01-29 | 3 | -23/+35 |
| | | | | | |||||
* | | | | | Merge branch '42290-pass-BUNDLE_PATH' into 'master' | Rémy Coutable | 2018-01-29 | 1 | -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_PATH | Lin Jen-Shin | 2018-01-26 | 1 | -1/+5 |
| | |_|/ | |/| | | |||||
* | | | | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error | James Lopez | 2018-01-26 | 1 | -1/+6 |
| | | | | |||||
* | | | | disable retry attempts for Import/Export until that is fixed | James Lopez | 2018-01-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master' | Robert Speicher | 2018-01-25 | 4 | -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-gitaly | Ahmad Sherif | 2018-01-24 | 4 | -6/+39 |
| | | | | | | | | | | | | | | | | Closes gitaly#946 | ||||
* | | | | Merge branch 'lint-rugged' into 'master' | Rémy Coutable | 2018-01-25 | 5 | -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-rugged | Jacob Vosmaer | 2018-01-25 | 5 | -10/+21 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'contrain-run-git' into 'master' | Rémy Coutable | 2018-01-25 | 1 | -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-git | Jacob Vosmaer | 2018-01-25 | 1 | -17/+82 |
| | | | | | |||||
* | | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master' | Grzegorz Bizon | 2018-01-25 | 2 | -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-enum | Ahmad Sherif | 2018-01-25 | 2 | -3/+3 |
| |/ / / / | |||||
* | | | | | Make Gitaly RepositoryExists opt-out | Jacob Vosmaer (GitLab) | 2018-01-25 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'revert-9f5390d8' into 'master' | Marin Jankovski | 2018-01-25 | 1 | -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 Maan | 2018-01-25 | 1 | -10/+1 |
| | | | | | | | | | | | | | | | This reverts merge request !16626 | ||||
* | | | | | Merge branch 'revert-430b3f0e' into 'master' | Douwe Maan | 2018-01-25 | 1 | -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-430b3f0e | Jacob Vosmaer (GitLab) | 2018-01-25 | 1 | -1/+26 |
| |/ / / | | | | | | | | | This reverts merge request !16525 | ||||
* | | | | Merge branch 'jej/gitattributes-check-at-ref' into 'master' | Rémy Coutable | 2018-01-25 | 4 | -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-ref | James Edwards-Jones | 2018-01-24 | 4 | -38/+92 |
| | | | | |||||
* | | | | Merge branch ↵ | Rémy Coutable | 2018-01-25 | 1 | -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-8bit | Lin Jen-Shin | 2018-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | when counting commit count. | ||||
* | | | | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-check | Stan Hu | 2018-01-24 | 3 | -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 Speicher | 2018-01-24 | 1 | -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::WikiPage | Ahmad Sherif | 2018-01-24 | 1 | -1/+2 |
| | |_|/ / | |/| | | | | | | | | | | | | | Related to #39805 | ||||
* | | | | | Merge branch 'search-100' into 'master' | Yorick Peterse | 2018-01-24 | 4 | -21/+51 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502 | ||||
| * | | | | | Use limit for search count queriessearch-100 | Jan Provaznik | 2018-01-23 | 4 | -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-gitaly | Ahmad Sherif | 2018-01-24 | 3 | -7/+39 |
| |/ / / / |/| | | | | | | | | | | | | | | Closes gitaly#921 | ||||
* | | | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master' | Robert Speicher | 2018-01-24 | 5 | -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-gitaly | Ahmad Sherif | 2018-01-24 | 5 | -6/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#929 |