summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trizzi-master-patch-43016' into 'master'Dmitriy Zaporozhets2019-06-051-2/+2
|\
| * Update maven template with correct linktrizzi-master-patch-43016Tim Rizzi2019-06-041-2/+2
* | Fix gitaly rspec failures 'too many open files'Jacob Vosmaer2019-06-051-0/+1
* | Add yaml lintKamil Trzciński2019-06-0544-331/+334
* | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-056-1/+216
|\ \
| * | Cleanup #attributes method54140-non-ar-cache-commit-markdownPatrick Bajao2019-06-051-20/+14
| * | Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-051-2/+2
| * | Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-051-1/+1
| * | Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-056-1/+222
* | | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-051-0/+31
|\ \ \
| * | | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-051-0/+31
| |/ /
* | | Merge branch '11126-fix-repository-size-check-ce' into 'master'Stan Hu2019-06-052-0/+12
|\ \ \
| * | | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-cePatrick Bajao2019-06-052-0/+12
| |/ /
* | | Merge branch 'bvl-use-global-ids-graphql' into 'master'Jan Provaznik2019-06-051-1/+1
|\ \ \
| * | | Expose IDs in GraphQL as a GlobalIDBob Van Landuyt2019-06-031-1/+1
* | | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-051-0/+1
|\ \ \ \
| * | | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+1
* | | | | Add multiple extends supportWolphin2019-06-052-18/+43
| |_|/ / |/| | |
* | | | Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-043-21/+74
|\ \ \ \
| * | | | Add comment to clarify system proc stat field61964-unicorn-instrumentationRyan Cobb2019-06-041-0/+2
| * | | | Remove unnecessary super call in unicorn samplerRyan Cobb2019-06-031-4/+0
| * | | | Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-2946-305/+426
| |\ \ \ \
| * | | | | Fix typo in system.rbRyan Cobb2019-05-201-1/+1
| * | | | | Adds ruby and unicorn instrumentationRyan Cobb2019-05-203-17/+72
* | | | | | Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'Mayra Cabrera2019-06-041-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Bump Helm version in Auto-DevOps.gitlab-ci.ymlbump-auto-devops-helm-2-14-0Thong Kuah2019-06-041-2/+2
* | | | | | Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-041-1/+1
|\ \ \ \ \ \
| * | | | | | Make `resolvable_types` a class methodBob Van Landuyt2019-06-031-1/+1
* | | | | | | Merge branch 'trizzi-master-patch-86505' into 'master'Dmitriy Zaporozhets2019-06-041-59/+15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Clarify error message and image in ymltrizzi-master-patch-86505Tim Rizzi2019-06-031-3/+4
| * | | | | | Update yml file comments re: deployTim Rizzi2019-05-301-4/+4
| * | | | | | Update instructions and uncomment out deployTim Rizzi2019-05-301-13/+13
| * | | | | | Simplify deploy script and comment out for CETim Rizzi2019-05-301-11/+16
| * | | | | | Update maven.gitlab-ci.yml for GitLab PackageTim Rizzi2019-05-271-59/+9
* | | | | | | Ignore Puma empty worker statsJan Provaznik2019-06-041-1/+2
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-032-1/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-031-0/+8
| |\ \ \ \ \ \
| | * | | | | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-241-0/+8
| * | | | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-031-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Change `prohibited_key` to use regexescharlieablett2019-05-011-4/+2
| | * | | | | | | Add `html` to sensitive wordscharlieablett2019-05-011-1/+1
| | * | | | | | | Refactor `attribute_cleaner` for readabilitycharlieablett2019-04-301-1/+3
| | * | | | | | | Further clarify `attribute_cleaner`charlieablett2019-04-291-10/+4
| | * | | | | | | Tighten up prohibited_key methodcharlieablett2019-04-261-3/+2
| | * | | | | | | Use English instead of LatinCharlie Ablett2019-04-251-2/+2
| | * | | | | | | Add disallowed fields to AttributeCleanercharlieablett2019-04-242-4/+13
| | * | | | | | | Exclude fields from note importcharlieablett2019-04-231-0/+3
* | | | | | | | | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-032-19/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add payload to the service responseOswaldo Ferreira2019-05-311-2/+2
| * | | | | | | | Simplify merge_ref_head methodsOswaldo Ferreira2019-05-311-2/+2
View Lorry Controller Status