Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix gitaly rspec failures 'too many open files' | Jacob Vosmaer | 2019-06-05 | 1 | -0/+1 |
* | Add yaml lint | Kamil TrzciĆski | 2019-06-05 | 44 | -331/+334 |
* | Merge branch '54140-non-ar-cache-commit-markdown' into 'master' | Douwe Maan | 2019-06-05 | 6 | -1/+216 |
|\ | |||||
| * | Cleanup #attributes method54140-non-ar-cache-commit-markdown | Patrick Bajao | 2019-06-05 | 1 | -20/+14 |
| * | Remove requirement for id for #markdown_cache_key | Patrick Bajao | 2019-06-05 | 1 | -2/+2 |
| * | Use #cache_key of subject for generated redis key | Patrick Bajao | 2019-06-05 | 1 | -1/+1 |
| * | Use Redis for CacheMarkDownField on non AR models | Patrick Bajao | 2019-06-05 | 6 | -1/+222 |
* | | Merge branch 'graphql-file-entry-url' into 'master' | Nick Thomas | 2019-06-05 | 1 | -0/+31 |
|\ \ | |||||
| * | | Add web_url to tree entry in GraphQL API | Phil Hughes | 2019-06-05 | 1 | -0/+31 |
| |/ | |||||
* | | Merge branch '11126-fix-repository-size-check-ce' into 'master' | Stan Hu | 2019-06-05 | 2 | -0/+12 |
|\ \ | |||||
| * | | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-ce | Patrick Bajao | 2019-06-05 | 2 | -0/+12 |
| |/ | |||||
* | | Merge branch 'bvl-use-global-ids-graphql' into 'master' | Jan Provaznik | 2019-06-05 | 1 | -1/+1 |
|\ \ | |||||
| * | | Expose IDs in GraphQL as a GlobalID | Bob Van Landuyt | 2019-06-03 | 1 | -1/+1 |
* | | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master' | Douglas Barbosa Alexandre | 2019-06-05 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-apps | Thong Kuah | 2019-06-05 | 1 | -0/+1 |
* | | | | Add multiple extends support | Wolphin | 2019-06-05 | 2 | -18/+43 |
| |_|/ |/| | | |||||
* | | | Merge branch '61964-unicorn-instrumentation' into 'master' | Bob Van Landuyt | 2019-06-04 | 3 | -21/+74 |
|\ \ \ | |||||
| * | | | Add comment to clarify system proc stat field61964-unicorn-instrumentation | Ryan Cobb | 2019-06-04 | 1 | -0/+2 |
| * | | | Remove unnecessary super call in unicorn sampler | Ryan Cobb | 2019-06-03 | 1 | -4/+0 |
| * | | | Merge branch 'master' into 61964-unicorn-instrumentation | Ryan Cobb | 2019-05-29 | 46 | -305/+426 |
| |\ \ \ | |||||
| * | | | | Fix typo in system.rb | Ryan Cobb | 2019-05-20 | 1 | -1/+1 |
| * | | | | Adds ruby and unicorn instrumentation | Ryan Cobb | 2019-05-20 | 3 | -17/+72 |
* | | | | | Merge branch 'bump-auto-devops-helm-2-14-0' into 'master' | Mayra Cabrera | 2019-06-04 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Bump Helm version in Auto-DevOps.gitlab-ci.ymlbump-auto-devops-helm-2-14-0 | Thong Kuah | 2019-06-04 | 1 | -2/+2 |
* | | | | | | Merge branch 'bvl-design-diff-notes-ce' into 'master' | Douwe Maan | 2019-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make `resolvable_types` a class method | Bob Van Landuyt | 2019-06-03 | 1 | -1/+1 |
* | | | | | | | Merge branch 'trizzi-master-patch-86505' into 'master' | Dmitriy Zaporozhets | 2019-06-04 | 1 | -59/+15 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Clarify error message and image in ymltrizzi-master-patch-86505 | Tim Rizzi | 2019-06-03 | 1 | -3/+4 |
| * | | | | | | Update yml file comments re: deploy | Tim Rizzi | 2019-05-30 | 1 | -4/+4 |
| * | | | | | | Update instructions and uncomment out deploy | Tim Rizzi | 2019-05-30 | 1 | -13/+13 |
| * | | | | | | Simplify deploy script and comment out for CE | Tim Rizzi | 2019-05-30 | 1 | -11/+16 |
| * | | | | | | Update maven.gitlab-ci.yml for GitLab Package | Tim Rizzi | 2019-05-27 | 1 | -59/+9 |
* | | | | | | | Ignore Puma empty worker stats | Jan Provaznik | 2019-06-04 | 1 | -1/+2 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Robert Speicher | 2019-06-03 | 2 | -1/+14 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'security-60143-address-xss-issue-master' into 'master' | Robert Speicher | 2019-06-03 | 1 | -0/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Reject slug+uri concat if slug is deemed unsafe | Kerri Miller | 2019-05-24 | 1 | -0/+8 |
| * | | | | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master' | Robert Speicher | 2019-06-03 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Change `prohibited_key` to use regexes | charlieablett | 2019-05-01 | 1 | -4/+2 |
| | * | | | | | | | Add `html` to sensitive words | charlieablett | 2019-05-01 | 1 | -1/+1 |
| | * | | | | | | | Refactor `attribute_cleaner` for readability | charlieablett | 2019-04-30 | 1 | -1/+3 |
| | * | | | | | | | Further clarify `attribute_cleaner` | charlieablett | 2019-04-29 | 1 | -10/+4 |
| | * | | | | | | | Tighten up prohibited_key method | charlieablett | 2019-04-26 | 1 | -3/+2 |
| | * | | | | | | | Use English instead of Latin | Charlie Ablett | 2019-04-25 | 1 | -2/+2 |
| | * | | | | | | | Add disallowed fields to AttributeCleaner | charlieablett | 2019-04-24 | 2 | -4/+13 |
| | * | | | | | | | Exclude fields from note import | charlieablett | 2019-04-23 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master' | Douwe Maan | 2019-06-03 | 2 | -19/+7 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Add payload to the service response | Oswaldo Ferreira | 2019-05-31 | 1 | -2/+2 |
| * | | | | | | | | Simplify merge_ref_head methods | Oswaldo Ferreira | 2019-05-31 | 1 | -2/+2 |
| * | | | | | | | | Automatically update MR merge-ref along merge status | Oswaldo Ferreira | 2019-05-31 | 2 | -19/+7 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge dev.gitlab.org master into GitLab.com master | Yorick Peterse | 2019-06-03 | 9 | -29/+145 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | |