Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remote | Alejandro Rodríguez | 2018-01-05 | 2 | -16/+39 |
| | |||||
* | fix issue #37843 | Danny | 2018-01-03 | 1 | -0/+4 |
| | |||||
* | Refactoring Gitlab::BareRepositoryImport::Repository | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -6/+6 |
| | |||||
* | Remove unused variable from bare repository importer spec | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -1/+0 |
| | |||||
* | Refactoring spec for Gitlab::BareRepositoryImport::Repository | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -6/+11 |
| | |||||
* | Fix Repository#processable? to allow .git repos in the root folder | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -2/+8 |
| | |||||
* | Import directory tree created with hashed storage using import rake task | Douglas Barbosa Alexandre | 2018-01-03 | 2 | -37/+96 |
| | |||||
* | Merge branch 'sh-optimize-commit-stats' into 'master' | Robert Speicher | 2018-01-03 | 1 | -0/+5 |
|\ | | | | | | | | | Speed up generation of commit stats by using Rugged native methods See merge request gitlab-org/gitlab-ce!16186 | ||||
| * | Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-stats | Stan Hu | 2018-01-02 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | The previous implementation iterated across the entire patch set to determine the number of lines added, deleted, and changed. Rugged has a native method `Rugged::Diff#stat` that does this already, which appears to be a little faster and require less RAM than doing this ourselves. Improves performance in #41524 | ||||
* | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master' | Robert Speicher | 2018-01-03 | 1 | -23/+49 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate repo forking to Gitaly Closes gitaly#825 See merge request gitlab-org/gitlab-ce!16018 | ||||
| * | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitaly | Ahmad Sherif | 2018-01-02 | 1 | -23/+49 |
| | | | | | | | | | | | | Closes gitaly#825 | ||||
* | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵ | Douwe Maan | 2018-01-03 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115 | ||||
| * | | | refactor code to use new import type | James Lopez | 2018-01-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix wiki check | James Lopez | 2018-01-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | add extra spec check | James Lopez | 2018-01-02 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fix import scheduled on bare repo import | James Lopez | 2018-01-02 | 1 | -0/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'jprovazn-search-issues' into 'master' | Sean McGivern | 2018-01-03 | 1 | -7/+28 |
|\ \ \ | | | | | | | | | | | | | | | | | Skip projects filter on issues search See merge request gitlab-org/gitlab-ce!16117 | ||||
| * | | | Skip projects filter on issues searchjprovazn-search-issues | Jan Provaznik | 2018-01-02 | 1 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for issues, an additional subquery is added which filters only issues in a project. If global context is used (no project is specified) this query filters all projects user has access to. In that case we can skip this filter because filtering only projects user has access to is added anyway. The filter is used only if a custom project context is specified Related to #40540 | ||||
* | | | | Merge branch 'gitaly-conflict-resolver' into 'master' | Grzegorz Bizon | 2018-01-03 | 1 | -0/+90 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755 | ||||
| * | | | | Simplify conflict resolution interface and codegitaly-conflict-resolver | Alejandro Rodríguez | 2018-01-02 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly | ||||
| * | | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -7/+36 |
| | | | | | |||||
| * | | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -0/+58 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master' | Douwe Maan | 2018-01-02 | 1 | -0/+27 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Forking a project to a namespace with lower visibility Closes #40022 See merge request gitlab-org/gitlab-ce!16050 | ||||
| * | | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespace | Bob Van Landuyt | 2017-12-29 | 1 | -0/+27 |
| |/ / | | | | | | | | | | | | | | | | | | | In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked. | ||||
* | | | Merge branch 'gitaly-encoding-helpers' into 'master' | Grzegorz Bizon | 2017-12-29 | 2 | -14/+14 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Move encoding methods to the more general EncodingHelper Closes gitaly#847 See merge request gitlab-org/gitlab-ce!16137 | ||||
| * | | Move encoding methods to the more general EncodingHelpergitaly-encoding-helpers | Alejandro Rodríguez | 2017-12-28 | 2 | -14/+14 |
| | | | |||||
* | | | Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master' | Grzegorz Bizon | 2017-12-26 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500s with anonymous clones for a project that has moved Closes #41457 See merge request gitlab-org/gitlab-ce!16128 | ||||
| * | | | Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-moved | Stan Hu | 2017-12-25 | 1 | -2/+1 |
| | | | | |||||
| * | | | Fix Error 500s with anonymous clones for a project that has moved | Stan Hu | 2017-12-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | Closes #41457 | ||||
* | | | | Merge branch 'sh-catch-invalid-uri-markdown' into 'master' | Robert Speicher | 2017-12-25 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Gracefully handle garbled URIs in Markdown Closes #41442 See merge request gitlab-org/gitlab-ce!16123 | ||||
| * | | | Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdown | Stan Hu | 2017-12-22 | 1 | -0/+5 |
| |/ / | | | | | | | | | | | | | | | | | | | There are certain inputs that look like valid URIs that are accepted by URI but not Addressable::URI. Handle the case where the latter fails. Closes #41442 | ||||
* | | | Merge branch 'gitaly-remotes' into 'master' | Dmitriy Zaporozhets | 2017-12-25 | 2 | -15/+90 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060 | ||||
| * | | | Incorporate Gitaly's RemoteService RPCsgitaly-remotes | Alejandro Rodríguez | 2017-12-22 | 2 | -0/+90 |
| | | | | |||||
| * | | | Remove unused method `remote_exists?` | Alejandro Rodríguez | 2017-12-22 | 1 | -15/+0 |
| | | | | |||||
* | | | | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵ | Rémy Coutable | 2017-12-23 | 29 | -76/+76 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069 | ||||
| * | | | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specs | blackst0ne | 2017-12-22 | 29 | -76/+76 |
| | |/ | |/| | |||||
* | | | Extend Cluster Applications to allow installation of Prometheus | Mayra Cabrera | 2017-12-22 | 3 | -40/+206 |
| | | | |||||
* | | | Use relative URLs when linking to uploaded files | Nick Thomas | 2017-12-22 | 2 | -133/+81 |
|/ / | |||||
* | | Merge branch 'jprovazn-search' into 'master' | Yorick Peterse | 2017-12-21 | 1 | -0/+11 |
|\ \ | | | | | | | | | | | | | Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955 | ||||
| * | | Skip projects filter on merge requests searchjprovazn-search | Jan Provaznik | 2017-12-21 | 1 | -0/+11 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540 | ||||
* | | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master' | Douwe Maan | 2017-12-21 | 2 | -8/+11 |
|\ \ | |/ |/| | | | | | | | | | Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881 | ||||
| * | Use seconds where possible, and convert to milliseconds for Influxdb consumption | Pawel Chojnacki | 2017-12-21 | 2 | -10/+12 |
| | | |||||
| * | Fix tests and formatting | Pawel Chojnacki | 2017-12-19 | 1 | -5/+6 |
| | | |||||
| * | Make `System.monotonic_time` retun seconds represented by float with ↵ | Pawel Chojnacki | 2017-12-12 | 1 | -2/+2 |
| | | | | | | | | microsecond precision | ||||
* | | Migrate to Project#empty_repo?zj-empty-repo-importer | Zeger-Jan van de Weg | 2017-12-20 | 1 | -4/+4 |
| | | |||||
* | | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb | Valery Sizov | 2017-12-19 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master' | Kamil Trzciński | 2017-12-18 | 1 | -0/+29 |
|\ \ | | | | | | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700 | ||||
| * | | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-now | Stan Hu | 2017-12-12 | 1 | -2/+4 |
| | | | |||||
| * | | Add spec for ActionRateLimiter | Stan Hu | 2017-12-12 | 1 | -0/+27 |
| | | | |||||
* | | | Merge branch 'no-ivar-in-modules' into 'master' | Robert Speicher | 2017-12-15 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Add cop to make sure we don't use ivar in a module See merge request gitlab-org/gitlab-ce!12800 |