summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'osw-configurable-single-diff-file-limit' into 'master'Douwe Maan2018-10-022-32/+32
|\
| * Make single diff patch limit configurableosw-configurable-single-diff-file-limitOswaldo Ferreira2018-10-012-32/+32
* | Use tiller locally for Auto DevopsThong Kuah2018-10-021-9/+18
* | Add variables on pipeline webhookPierre Tardy2018-10-011-1/+2
* | Merge remote-tracking branch 'dev/master'Bob Van Landuyt2018-10-013-5/+33
|\ \
| * \ Merge branch 'security-2697-code-highlight-timeout' into 'master'Bob Van Landuyt2018-10-011-1/+13
| |\ \
| | * | Fix syntax highlight taking too longMark Chao2018-09-031-1/+13
| * | | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-011-1/+1
| * | | Merge branch 'fix-events-finder-incomplete' into 'master'Bob Van Landuyt2018-10-011-3/+19
| |\ \ \
| | * | | Redact events shown in the events APINick Thomas2018-09-211-3/+19
* | | | | Merge branch 'lib-api-frozen-string-enable' into 'master'Rémy Coutable2018-10-01100-1/+202
|\ \ \ \ \
| * | | | | Enable frozen string in lib/api and lib/backupgfyoung2018-09-29100-1/+202
* | | | | | Merge branch '51021-more-attr-encrypted' into 'master'Rémy Coutable2018-10-013-0/+114
|\ \ \ \ \ \
| * | | | | | Migrate sensitive web hook data in the backgroundNick Thomas2018-10-012-0/+108
| * | | | | | Encrypt webhook tokens and URLs in the databaseNick Thomas2018-10-011-0/+6
* | | | | | | Merge branch 'feature/set-public-email-through-api' into 'master'Rémy Coutable2018-10-011-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | allow users api to set public_emailAlexis Reigel2018-10-011-0/+1
| * | | | | | remove obsolete parameter from users apiAlexis Reigel2018-09-261-1/+0
* | | | | | | Merge branch 'sh-fix-issue-52009' into 'master'Sean McGivern2018-10-011-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Prevent Error 500s with invalid relative linksStan Hu2018-09-291-1/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-013-12/+40
|\ \ \ \ \ \ \
| * | | | | | | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-013-12/+40
* | | | | | | | Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'Dmitriy Zaporozhets2018-10-011-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Skip creating auto devops jobs for sast, container_scanning, dast, dependency...48399-skip-auto-devops-jobs-based-on-licenseDylan Griffith2018-09-271-3/+14
* | | | | | | | | Merge branch '51651-fill-pipeline-source-for-external-pipelines' into 'master'Kamil Trzciński2018-09-301-0/+50
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Refactor migration specs using ActiveRecord modelsMatija Čupić2018-09-281-1/+1
| * | | | | | | | Refactor external_pipelines queryMatija Čupić2018-09-271-8/+5
| * | | | | | | | Update all pipelines in single queryMatija Čupić2018-09-271-3/+2
| * | | | | | | | Add background migration to fill pipeline sourceMatija Čupić2018-09-251-0/+54
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'dz-migration-index-helper' into 'master'Dmitriy Zaporozhets2018-09-281-0/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add mysql_compatible_index_length to migration helpersdz-migration-index-helperDmitriy Zaporozhets2018-09-211-0/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mk/asymmetric-exists-cache' into 'master'Stan Hu2018-09-282-48/+149
|\ \ \ \ \ \ \
| * | | | | | | Remove send-in-send for safety and readabilityMichael Kozono2018-09-271-13/+28
| * | | | | | | Expire RequestStore cache properlyMichael Kozono2018-09-271-0/+8
| * | | | | | | Cache `Repository#exists?` false in RequestStoreMichael Kozono2018-09-272-0/+52
| * | | | | | | Extract `Repository.memoize_method` methodMichael Kozono2018-09-271-47/+73
* | | | | | | | Extend reports to support security featuresOlivier Gonzalez2018-09-275-76/+98
* | | | | | | | Merge branch '4907-improve-build-create-performance-for-license-management' i...Kamil Trzciński2018-09-271-8/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Dont create license_management build when not included in license4907-improve-build-create-performance-for-license-managementDylan Griffith2018-09-271-8/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Typo in log message of gitlab-rake gitlab:artifacts:migrateMichael Bisbjerg2018-09-271-1/+1
|/ / / / / / /
* | | | | | | Merge branch '43832-adds-chdmod-to-commits-actions-api' into 'master'Rémy Coutable2018-09-272-2/+22
|\ \ \ \ \ \ \
| * | | | | | | Adds chmod action to POST /projects/:id/repository/commits APIJacopo2018-09-272-2/+22
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'feature/add-public-email-to-users-api' into 'master'Rémy Coutable2018-09-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | add user's public_email attribute to apiAlexis Reigel2018-09-271-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '50289-vendor-ci-yml-for-the-last-time' into 'master'Kamil Trzciński2018-09-274-19/+82
|\ \ \ \ \ \ \
| * | | | | | | Update all gitlab ci templates from gitlab-org/gitlab-ci-yml50289-vendor-ci-yml-for-the-last-timeDylan Griffith2018-09-274-19/+82
* | | | | | | | Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-urlRémy Coutable2018-09-261-60/+26
* | | | | | | | Merge branch 'feature/runner-type-filter-for-admin-view' into 'master'Kamil Trzciński2018-09-261-3/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add status param to runners apiAlexis Reigel2018-09-151-0/+9
| * | | | | | | add type param to runners apiAlexis Reigel2018-09-151-3/+19
| |/ / / / / /