summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-8/+8
* 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
|\ \ \ | |/ / |/| |
| * | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-211-2/+13
| |/
* | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'Douwe Maan2017-12-216-18/+23
|\ \ | |/ |/|
| * Use seconds where possible, and convert to milliseconds for Influxdb consumptionPawel Chojnacki2017-12-212-18/+14
| * use in_milliseconds rails helperPawel Chojnacki2017-12-202-3/+3
| * Fix tests and formattingPawel Chojnacki2017-12-193-2/+2
| * Make `System.monotonic_time` retun seconds represented by float with microsec...Pawel Chojnacki2017-12-125-15/+24
| * Fix gitaly_call_histogram to observe times in seconds correctlyPawel Chojnacki2017-12-121-1/+1
| * Reduce cardinality of gitlab_cache_operation_duration_seconds histogramPawel Chojnacki2017-12-121-1/+1
* | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docsRobert Speicher2017-12-201-8/+3
|\ \
| * | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-201-8/+3