summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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_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 issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-033-10/+204
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-041-0/+135
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-021-0/+135
| |/ / / / / /
* | | | | | | 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 methodssh-optimize-commit-statsStan Hu2018-01-021-7/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-033-16/+68
|\ \ \ \ \ \
| * | | | | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-023-16/+68
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sh-fix-seed-fu-ci' into 'master'Robert Speicher2018-01-031-1/+1
|\ \ \ \ \ \
| * | | | | | Fix `rake db:seed_fu` not doing anything in CIsh-fix-seed-fu-ciStan Hu2018-01-021-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' into...Douwe Maan2018-01-032-1/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 searchjprovazn-search-issuesJan Provaznik2018-01-021-1/+4
* | | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-037-31/+180
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-025-51/+64
| * | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-273-28/+80
| * | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-274-5/+89
| | |_|/ | |/| |
* | | | 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.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-291-3/+9
* | | | Merge branch 'gitaly-encoding-helpers' into 'master'Grzegorz Bizon2017-12-297-66/+72
|\ \ \ \ | |/ / / |/| | |
| * | | 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 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
* | | Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-movedStan Hu2017-12-251-10/+7
* | | Fix Error 500s with anonymous clones for a project that has movedStan Hu2017-12-251-3/+10
* | | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-252-21/+68
|\ \ \
| * | | Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro Rodríguez2017-12-222-16/+68
| * | | Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-221-5/+0
* | | | Fix namespace ambiguity with Kubernetes Pod definitionssh-fix-helm-api-specStan Hu2017-12-241-1/+1
| |/ / |/| |
* | | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-221-1/+3
|\ \ \
| * | | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_...Douwe Maan2017-12-221-1/+3
* | | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-224-89/+165
* | | | Use gitlab-stylesRémy Coutable2017-12-222-8/+7
| |_|/ |/| |
* | | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-211-2/+13
|\ \ \ | |/ / |/| |