summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-042-4/+7
|
* Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-041-8/+8
|\ | | | | | | | | Avoid leaving a push event empty if payload cannot be created See merge request gitlab-org/gitlab-ce!16214
| * Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-8/+8
| | | | | | | | | | | | | | | | If the payload cannot be created for some reason, we could be left with a nil push event payload, which causes Error 500s when viewing the dashboard. Guard against this error and log when it happens. Avoids problems seen in #38823
* | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-041-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Handle Gitaly aborted merge due to branch update Closes gitaly#854 See merge request gitlab-org/gitlab-ce!16116
| * | Fix method lookupJacob Vosmaer2018-01-031-1/+3
| | |
| * | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-031-0/+1
| | |
* | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-042-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Add support for max_count option to Git::Repository#count_commits See merge request gitlab-org/gitlab-ce!16145
| * | | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-272-0/+2
| | | |
* | | | Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-043-10/+204
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use a background migration for migrating issues.closed_at See merge request gitlab-org/gitlab-ce!16083
| * | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-033-10/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous attempt (rolled back in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16021) we tried to migrate `issues.closed_at` from timestamp to timestamptz using a regular migration. This has a bad impact on GitLab.com and as such was rolled back. This commit re-implements the original migrations using generic background migrations, allowing us to still migrate the data in a single release but without a negative impact on availability. To ensure the database schema is up to date the background migrations are performed inline in development and test environments. We also make sure to not migrate that that doesn't need migrating in the first place or has already been migrated.
* | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-041-0/+135
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-021-0/+135
| | | | | |
* | | | | | Merge branch ↵Grzegorz Bizon2018-01-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
| * | | | | | Fix API endpoints to edit wiki pages where project belongs to a grouprd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-groupRubén Dávila2018-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases is prefered to manually create a ProjectWiki over using Project#wiki. This is because Project#wiki always uses the #owner (which is a User sometimes) as the author of the wiki changes but sometimes the owner is a Group and it doesn't respond to #username
* | | | | | | fix issue #37843Danny2018-01-031-1/+1
| | | | | | |
* | | | | | | Fix Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-031-1/+2
| | | | | | |
* | | | | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-031-5/+2
| | | | | | |
* | | | | | | Import directory tree created with hashed storage using import rake taskDouglas Barbosa Alexandre2018-01-032-12/+33
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'sh-optimize-commit-stats' into 'master'Robert Speicher2018-01-031-7/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-statsStan Hu2018-01-021-7/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Speicher2018-01-033-16/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate repo forking to Gitaly Closes gitaly#825 See merge request gitlab-org/gitlab-ce!16018
| * | | | | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-023-16/+68
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Closes gitaly#825
* | | | | | Merge branch 'sh-fix-seed-fu-ci' into 'master'Robert Speicher2018-01-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `rake db:seed_fu` not doing anything in CI Closes #41517 See merge request gitlab-org/gitlab-ce!16146
| * | | | | | Fix `rake db:seed_fu` not doing anything in CIsh-fix-seed-fu-ciStan Hu2018-01-021-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default behavior of seed_fu is to load the fixtures using the RAILS_ENV environment. In CI, since we set RAILS_ENV=test, nothing is ever loaded. Instead of `rake db:seed_fu`, use `rake gitlab:setup`, which sets up MySQL properly with limits. Closes #41517
* | | | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-032-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| * | | | | | add note to import sourcesJames Lopez2018-01-031-0/+1
| | | | | | |
| * | | | | | refactor code to use new import typeJames Lopez2018-01-031-2/+1
| | | | | | |
| * | | | | | fix missing create services callJames Lopez2018-01-021-2/+0
| | | | | | |
| * | | | | | fix wiki checkJames Lopez2018-01-021-0/+2
| | | | | | |
| * | | | | | Fix import scheduled on bare repo importJames Lopez2018-01-021-0/+2
| |/ / / / /
* | | | | | Fix method lookupfix-encoding-method-lookupJacob Vosmaer2018-01-031-1/+3
| |_|_|_|/ |/| | | |
* | | | | Multi File Editor File iconsTim Zallmann2018-01-031-0/+1
| | | | |
* | | | | Merge branch 'jprovazn-search-issues' into 'master'Sean McGivern2018-01-031-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Skip projects filter on issues search See merge request gitlab-org/gitlab-ce!16117
| * | | | | Skip projects filter on issues searchjprovazn-search-issuesJan Provaznik2018-01-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Bizon2018-01-037-31/+180
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
| * | | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-025-51/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
| * | | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-273-28/+80
| | | | | |
| * | | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-274-5/+89
| | |_|/ / | |/| | |
* | | | | Merge branch ↵Robert Speicher2018-01-021-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members' into 'master' Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`" See merge request gitlab-org/gitlab-ce!16051
| * | | | Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-membersRémy Coutable2017-12-211-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix-volume-backup' into 'master'Douwe Maan2018-01-021-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore "lost+found" folder during backup on a volume Closes #22672 and #17574 See merge request gitlab-org/gitlab-ce!16036
| * | | | | Ignore "lost+found" folder during backup on a volumejulien MILLAU2017-12-201-3/+3
| | | | | |
* | | | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-021-3/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-namespaceBob Van Landuyt2017-12-291-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Bizon2017-12-297-66/+72
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-helpersAlejandro Rodríguez2017-12-287-66/+72
| | | | | |
* | | | | | Merge branch 'gitaly-opt-out' into 'master'Stan Hu2017-12-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed Closes #38333 See merge request gitlab-org/gitlab-ce!16155
| * | | | | | Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixedAlejandro Rodríguez2017-12-281-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Fix feature flags for Gitaly's RemoteService RPCsAlejandro Rodríguez2017-12-271-2/+2
|/ / / / /
* | | | | Use Concurrent::AtomicReference instead AtomicFixnumOswaldo Ferreira2017-12-261-1/+1
| | | | |
View Lorry Controller Status