Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 5 | -0/+221 |
* | 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 | 21 | -110/+203 |
| |\ | |||||
| * | | 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 '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 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * \ \ \ | 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 dev.gitlab.org master into GitLab.com master | Yorick Peterse | 2019-06-03 | 7 | -27/+135 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'security-fix_milestones_search_api_leak' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 2 | -3/+31 |
| |\ \ \ \ \ | |||||
| | * | | | | | Resolve: Milestones leaked via search API | Felipe Artur | 2019-05-20 | 2 | -3/+31 |
| * | | | | | | Merge branch 'security-60039' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 1 | -2/+21 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Validate MR branch names | Mark Chao | 2019-05-03 | 1 | -2/+21 |
| * | | | | | | | Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Hide password on import by url form | Igor Drozdov | 2019-05-29 | 1 | -0/+4 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Add DNS rebinding protection settings | Oswaldo Ferreira | 2019-05-30 | 2 | -11/+32 |
| * | | | | | | | Protect Gitlab::HTTP against DNS rebinding attack | Douwe Maan | 2019-05-30 | 3 | -22/+58 |
* | | | | | | | | Merge branch 'ac-graphql-stats' into 'master' | Dmitriy Zaporozhets | 2019-06-03 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add Namespace and ProjectStatistics to GraphQL API | Alessio Caiazza | 2019-06-03 | 1 | -0/+23 |
* | | | | | | | | | Merge branch 'ce-fj-11886-fix-port-validation' into 'master' | Kamil Trzciński | 2019-06-03 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validation | Francisco Javier López | 2019-06-01 | 2 | -1/+4 |
* | | | | | | | | | Remove delta island feature flag | Zeger-Jan van de Weg | 2019-06-03 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master' | Douglas Barbosa Alexandre | 2019-05-31 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Reset merge status from mergeable MRs | Oswaldo Ferreira | 2019-05-31 | 1 | -0/+17 |
* | | | | | | | | | Merge branch 'gitaly-version-v1.43.0' into 'master' | Bob Van Landuyt | 2019-05-31 | 1 | -28/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove hook directory requirement from Shellgitaly-version-v1.43.0 | Zeger-Jan van de Weg | 2019-05-30 | 1 | -28/+0 |
* | | | | | | | | | | Merge branch '59587-add-graphql-logging' into 'master' | Sean McGivern | 2019-05-31 | 3 | -18/+80 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Apply reviewer feedback59587-add-graphql-logging | charlie ablett | 2019-05-31 | 1 | -21/+27 |
| * | | | | | | | | | | Move complexity/depth to `final_value` | charlieablett | 2019-05-30 | 1 | -9/+11 |