Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '54140-non-ar-cache-commit-markdown' into 'master' | Douwe Maan | 2019-06-05 | 7 | -12/+372 |
|\ | |||||
| * | Remove requirement for id for #markdown_cache_key | Patrick Bajao | 2019-06-05 | 2 | -8/+0 |
| * | Use #cache_key of subject for generated redis key | Patrick Bajao | 2019-06-05 | 3 | -27/+37 |
| * | Use Redis for CacheMarkDownField on non AR models | Patrick Bajao | 2019-06-05 | 7 | -12/+370 |
* | | Merge branch 'graphql-file-entry-url' into 'master' | Nick Thomas | 2019-06-05 | 1 | -0/+20 |
|\ \ | |||||
| * | | Add web_url to tree entry in GraphQL API | Phil Hughes | 2019-06-05 | 1 | -0/+20 |
| |/ | |||||
* | | Merge branch '11126-fix-repository-size-check-ce' into 'master' | Stan Hu | 2019-06-05 | 2 | -0/+23 |
|\ \ | |||||
| * | | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-ce | Patrick Bajao | 2019-06-05 | 2 | -0/+23 |
| |/ | |||||
* | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master' | Douglas Barbosa Alexandre | 2019-06-05 | 1 | -0/+24 |
|\ \ | |||||
| * | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-apps | Thong Kuah | 2019-06-05 | 1 | -0/+24 |
* | | | Add multiple extends support | Wolphin | 2019-06-05 | 3 | -11/+39 |
| |/ |/| | |||||
* | | Merge branch '61964-unicorn-instrumentation' into 'master' | Bob Van Landuyt | 2019-06-04 | 3 | -8/+71 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into 61964-unicorn-instrumentation | Ryan Cobb | 2019-05-29 | 12 | -83/+313 |
| |\ | |||||
| * | | Adds ruby and unicorn instrumentation | Ryan Cobb | 2019-05-20 | 3 | -8/+71 |
* | | | Ignore Puma empty worker stats | Jan Provaznik | 2019-06-04 | 1 | -0/+27 |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Robert Speicher | 2019-06-03 | 4 | -1/+71 |
|\ \ \ | |||||
| * \ \ | Merge branch 'security-60143-address-xss-issue-master' into 'master' | Robert Speicher | 2019-06-03 | 1 | -0/+42 |
| |\ \ \ | |||||
| | * | | | Reject slug+uri concat if slug is deemed unsafe | Kerri Miller | 2019-05-24 | 1 | -0/+42 |
| * | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master' | Robert Speicher | 2019-06-03 | 3 | -1/+29 |
| |\ \ \ \ | |||||
| | * | | | | Remove unused fixture lines | Tiger | 2019-05-28 | 1 | -2/+0 |
| | * | | | | Add `html` to sensitive words | charlieablett | 2019-05-01 | 1 | -1/+2 |
| | * | | | | Remove accidental regressions | charlieablett | 2019-04-30 | 1 | -5/+6 |
| | * | | | | Ensure Issue & MR note_html cannot be imported | Ash McKenzie | 2019-04-30 | 2 | -16/+16 |
| | * | | | | Add disallowed fields to AttributeCleaner | charlieablett | 2019-04-24 | 2 | -10/+8 |
| | * | | | | Re-stub stubbed method calls | charlieablett | 2019-04-23 | 1 | -3/+9 |
| | * | | | | Exclude fields from note import | charlieablett | 2019-04-23 | 2 | -2/+26 |
* | | | | | | Merge dev.gitlab.org master into GitLab.com master | Yorick Peterse | 2019-06-03 | 16 | -64/+438 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'security-fix_milestones_search_api_leak' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 1 | -0/+24 |
| |\ \ \ \ \ | |||||
| | * | | | | | Resolve: Milestones leaked via search API | Felipe Artur | 2019-05-20 | 1 | -0/+24 |
| * | | | | | | Merge branch 'security-60039' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 2 | -27/+66 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Refactor spec to not use truthy or falsey | Mark Chao | 2019-05-03 | 1 | -58/+58 |
| | * | | | | | | Validate MR branch names | Mark Chao | 2019-05-03 | 2 | -27/+66 |
| * | | | | | | | Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 1 | -0/+34 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Hide password on import by url form | Igor Drozdov | 2019-05-29 | 1 | -0/+34 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'dm-http-hostname-override' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 11 | -23/+296 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add DNS rebinding protection settings | Oswaldo Ferreira | 2019-05-30 | 3 | -0/+97 |
| | * | | | | | | | Protect Gitlab::HTTP against DNS rebinding attack | Douwe Maan | 2019-05-30 | 10 | -23/+199 |
| * | | | | | | | | Merge branch 'security-fix-project-existence-disclosure-master' into 'master' | GitLab Release Tools Bot | 2019-06-03 | 1 | -14/+18 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fix url redaction for issue links | Patrick Derichs | 2019-05-03 | 1 | -14/+18 |
* | | | | | | | | | Merge branch 'ac-graphql-stats' into 'master' | Dmitriy Zaporozhets | 2019-06-03 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add Namespace and ProjectStatistics to GraphQL API | Alessio Caiazza | 2019-06-03 | 1 | -0/+18 |
* | | | | | | | | | | Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validation | Francisco Javier López | 2019-06-01 | 1 | -0/+10 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master' | Douglas Barbosa Alexandre | 2019-05-31 | 1 | -0/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Reset merge status from mergeable MRs | Oswaldo Ferreira | 2019-05-31 | 1 | -0/+48 |
* | | | | | | | | | | Merge branch 'dz-scope-project-routes-3' into 'master' | Lin Jen-Shin | 2019-05-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix specs after routing change | Dmitriy Zaporozhets | 2019-05-29 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'gitaly-version-v1.43.0' into 'master' | Bob Van Landuyt | 2019-05-31 | 3 | -68/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove hook directory requirement from Shellgitaly-version-v1.43.0 | Zeger-Jan van de Weg | 2019-05-30 | 3 | -68/+0 |
* | | | | | | | | | | | Merge branch '59587-add-graphql-logging' into 'master' | Sean McGivern | 2019-05-31 | 2 | -0/+65 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Apply reviewer feedback59587-add-graphql-logging | charlie ablett | 2019-05-31 | 2 | -14/+9 |