summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-2929-30/+434
|\
| * Merge branch 'security-enable-image-proxy' into 'master'GitLab Release Tools Bot2019-08-2911-6/+139
| |\
| | * Add support for using a Camo proxy serverBrett Walker2019-08-2311-6/+139
| * | Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' into...GitLab Release Tools Bot2019-08-293-5/+5
| |\ \
| | * | Filter out old system notes for epicsPatrick Derichs2019-08-283-5/+5
| * | | Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-292-4/+9
| |\ \ \
| | * | | Add direct upload support for personal snippetsJan Provaznik2019-08-232-4/+9
| * | | | Merge branch 'security-fix_jira_ssrf_vulnerability' into 'master'GitLab Release Tools Bot2019-08-291-0/+66
| |\ \ \ \
| | * | | | Fix DNS rebind vulnerability for JIRA integrationFelipe Artur2019-08-081-0/+66
| * | | | | Merge branch 'security-61974-limit-issue-comment-size' into 'master'GitLab Release Tools Bot2019-08-292-1/+5
| |\ \ \ \ \
| | * | | | | Limit the size of issuable description and commentsAlexandru Croitor2019-08-222-1/+5
| * | | | | | Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-294-1/+50
| |\ \ \ \ \ \
| | * | | | | | Add captcha if there are multiple failed login attemptsMałgorzata Ksionek2019-07-314-1/+50
| * | | | | | | Merge branch 'security-project-import-bypass' into 'master'GitLab Release Tools Bot2019-08-291-0/+88
| |\ \ \ \ \ \ \
| | * | | | | | | Fix project import restricted visibility bypassGeorge Koltsov2019-08-151-0/+88
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'security-add-job-activity-limit-ce' into 'master'GitLab Release Tools Bot2019-08-291-0/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Add active_jobs_limit to plans tableFabio Pitino2019-08-211-0/+21
| * | | | | | | | Merge branch 'security-fix-markdown-xss' into 'master'GitLab Release Tools Bot2019-08-294-13/+35
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Re-escape whole HTML content instead of only matchJan Provaznik2019-08-234-13/+35
| * | | | | | | | | Merge branch 'security-exposed-default-branch' into 'master'GitLab Release Tools Bot2019-08-291-0/+16
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Avoid exposing unaccessible repo data upon GFM processingOswaldo Ferreira2019-08-211-0/+16
* | | | | | | | | | Add a close issue slack slash commandSarah Yasonik2019-08-295-9/+105
* | | | | | | | | | Revert "Cache branch and tag names as Redis sets"Nick Thomas2019-08-292-120/+0
* | | | | | | | | | Merge branch '60071-remove-gitlab-keys-usage' into 'master'Nick Thomas2019-08-294-87/+73
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Auto create authorized_keys file if doesn't exist60071-remove-gitlab-keys-usagePatrick Bajao2019-08-292-0/+13
| * | | | | | | | | | Add system check for authorized_keys file permPatrick Bajao2019-08-293-7/+54
| * | | | | | | | | | Remove the fallback path from gitlab-cePatrick Bajao2019-08-291-80/+6
* | | | | | | | | | | Merge branch 'sh-support-content-for-snippets-api' into 'master'Kamil Trzciński2019-08-291-5/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Standardize use of `content` parameter in snippets APIsh-support-content-for-snippets-apiStan Hu2019-08-281-5/+9
* | | | | | | | | | | Merge branch 'mk/simplify-internal-post-receive-messages' into 'master'Grzegorz Bizon2019-08-294-17/+77
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Simplify internal post receive messagesmk/simplify-internal-post-receive-messagesMichael Kozono2019-08-284-17/+77
* | | | | | | | | | | Merge branch 'performance-bar-warnings' into 'master'Stan Hu2019-08-295-12/+90
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add top-level warnings key to performance bar responseperformance-bar-warningsSean McGivern2019-08-281-0/+19
| * | | | | | | | | | Return warnings for performance bar from backendSean McGivern2019-08-284-12/+71
* | | | | | | | | | | Support Gitaly feature flags in workhorseJacob Vosmaer2019-08-281-2/+4
* | | | | | | | | | | Rename Labkit::Tracing::GRPCInterceptor to GRPC::ClientInterceptorAndrew Newdigate2019-08-281-1/+1
* | | | | | | | | | | Update CE files for GSD projects filterVictor Zagorodny2019-08-283-11/+30
* | | | | | | | | | | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-282-35/+44
* | | | | | | | | | | Rename dev, org, com helperDoug Stull2019-08-281-1/+1
* | | | | | | | | | | Fix a nil error in Gitlab::Danger::TeammateRémy Coutable2019-08-271-2/+2
* | | | | | | | | | | Replace prepend_entity with prepend_if_eeWinnie Hellmann2019-08-271-0/+18
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '65312-use-group-labels-instead-of-legacy-team-labels-for-danger...Lin Jen-Shin2019-08-271-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Detect the new stage labels in Gitlab::Danger::Teammate65312-use-group-labels-instead-of-legacy-team-labels-for-danger-picking-test-reviewersRémy Coutable2019-08-271-2/+2
* | | | | | | | | | | Merge branch '13806-fix' into 'master'Lin Jen-Shin2019-08-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add nil check for Gitlab.config.prometheus13806-fixrpereira22019-08-261-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '57657-promote-label-to-group-label-via-api-endpoint' into 'master'Sean McGivern2019-08-271-0/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update docs targeting 12.3Robert Schilling2019-08-261-1/+1
| * | | | | | | | | | Move promote to put and add more specsRobert Schilling2019-08-261-1/+1
| * | | | | | | | | | Add docs and first specsRobert Schilling2019-08-261-3/+3
| * | | | | | | | | | API: Promote project labels to group labelsRobert Schilling2019-08-261-0/+25