summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-me...Robert Speicher2018-01-021-1/+3
|\
| * Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-membersRémy Coutable2017-12-211-1/+3
* | Merge branch 'fix-volume-backup' into 'master'Douwe Maan2018-01-021-3/+3
|\ \
| * | 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.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
* | | | Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'Grzegorz Bizon2017-12-261-0/+4
|\ \ \ \
| * | | | 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 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2017-12-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdownStan Hu2017-12-221-1/+1
| |/ / /
* | | | 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
| | |_|/ | |/| |
* | | | Merge branch 'sh-handle-orphaned-deploy-keys' into 'master'Grzegorz Bizon2017-12-251-3/+6
|\ \ \ \
| * | | | Gracefully handle orphaned write deploy keys in /internal/post_receivesh-handle-orphaned-deploy-keysStan Hu2017-12-241-3/+6
* | | | | Fix namespace ambiguity with Kubernetes Pod definitionssh-fix-helm-api-specStan Hu2017-12-241-1/+1
|/ / / /
* | | | Merge branch '32364-updating-slack-notification-not-working-by-api' into 'mas...Rémy Coutable2017-12-232-34/+151
|\ \ \ \ | |_|/ / |/| | |
| * | | Support new chat notifications parameters in Services APIMark Fletcher2017-12-222-34/+151
* | | | 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
* | | | | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-221-1/+9
|\ \ \ \ \
| * | | | | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-221-1/+9
| |/ / / /
* | | | | Merge branch '38893-banzai-upload-filter-relative-urls' into 'master'Douwe Maan2017-12-223-68/+39
|\ \ \ \ \
| * | | | | Use relative URLs when linking to uploaded filesNick Thomas2017-12-223-68/+39
* | | | | | Use gitlab-stylesRémy Coutable2017-12-222-8/+7
|/ / / / /
* | | | | Add index on namespaces lower(name) for UsersController#existsindex-namespaces-lower-nameGreg Stark2017-12-211-0/+2
| |/ / / |/| | |
* | | | 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
* | | | Migrate to Project#empty_repo?zj-empty-repo-importerZeger-Jan van de Weg2017-12-201-1/+1
|/ / /
* | | Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable2017-12-202-2/+3
|\ \ \
| * | | Add optional `search` param for Merge Requests APIMark Fletcher2017-12-201-0/+1
| * | | Employ declared_params in finder methods for MR and Issue API listsMark Fletcher2017-12-202-2/+2
* | | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-4/+4
|/ / /