summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entry13067-update-documentationmo khan2019-09-091-0/+5
* Describe how to enable the License-Check rulemo khan2019-09-061-0/+23
* Include licese compliance in documentationmo khan2019-09-061-1/+1
* Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-0516-226/+316
|\
| * Merge branch '66467-enable-error-tracking-only-user-can-read-sentry-logs' int...Clement Ho2019-09-0511-14/+86
| |\
| | * If user can't activate error tracking display a learn more button pointingManeschi Romain2019-09-0511-14/+86
| |/
| * Merge branch 'mc-refactors-rack-attack-requests-spec' into 'master'Stan Hu2019-09-052-212/+231
| |\
| | * Refactors rack attack requests specMayra Cabrera2019-09-052-212/+231
| |/
| * Merge branch 'update-text-on-import-and-mirroring-forms' into 'master'Stan Hu2019-09-055-0/+5
| |\
| | * Update text on project import and mirroring formsAdam Hegyi2019-09-055-0/+5
| |/
* | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-054-3/+14
|\ \ | |/
| * Merge branch 'fix-tmp-gitignore' into 'master'Robert Speicher2019-09-054-3/+14
| |\
| | * Fix Git ignore for tmp/, shared/, and plugins/fix-tmp-gitignoreYorick Peterse2019-09-034-3/+14
* | | Merge branch 'override-csp-for-jira-connect' into 'master'Stan Hu2019-09-052-0/+62
|\ \ \
| * | | Override CSP for Jira Connect page in iframeHeinrich Lee Yu2019-09-052-0/+62
* | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-057-30/+87
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'group_level_jupyterhub' into 'master'Robert Speicher2019-09-057-30/+87
| |\ \ \
| | * | | Allow group install of JupyterHubgroup_level_jupyterhubJames Fargher2019-09-055-28/+49
| | * | | Allow JupyterHub in group level UIJames Fargher2019-09-052-2/+38
* | | | | Merge branch 'ee-generic-api-endpoint' into 'master'Robert Speicher2019-09-054-6/+75
|\ \ \ \ \
| * | | | | Simplify project_without_auth methodVitali Tatarintev2019-09-052-12/+4
| * | | | | Fix Rubocop violationVitali Tatarintev2019-08-301-1/+0
| * | | | | Rename generic alert notifications controllerVitali Tatarintev2019-08-304-33/+36
| * | | | | Move generic alert route to EE routesVitali Tatarintev2019-08-292-4/+2
| * | | | | Hide generic alert endpoint behind a feature flagVitali Tatarintev2019-08-292-2/+29
| * | | | | Create a blank generic alert endpointVitali Tatarintev2019-08-293-0/+50
* | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-050-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'instance-level-security-dashboard-ce' into 'master'Mike Greiling2019-09-051-0/+1
| |\ \ \ \ \
| | * | | | | Adds route for instance level security dashboardMark Florian2019-09-051-0/+1
| |/ / / / /
* | | | | | Merge branch 'instance-level-security-dashboard' into 'master'Mike Greiling2019-09-055-0/+45
|\ \ \ \ \ \
| * | | | | | Adds the page for instance lvl security dashboardSam Beckham2019-09-055-0/+45
|/ / / / / /
* | | | | | Merge branch 'qa-fix-secure-e2e-tests' into 'master'Tanya Pazitny2019-09-056-34/+63
|\ \ \ \ \ \
| * | | | | | Fix and unquarantine Secure E2E testsAleksandr Soborov2019-09-056-34/+63
|/ / / / / /
* | | | | | Merge branch 'registry-replication' into 'master'Michael Kozono2019-09-053-9/+29
|\ \ \ \ \ \
| * | | | | | Fixes Docker Registry ReplicationValery Sizov2019-09-043-9/+29
* | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-059-10/+46
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'add-approval-status-field-lm-ce' into 'master'Rémy Coutable2019-09-051-2/+2
| |\ \ \ \ \ \
| | * | | | | | Extend License Compliance entity for Pipelines and MR viewCan Eldem2019-09-051-2/+2
| |/ / / / / /
| * | | | | | Merge branch 'dag-setup-test-env' into 'master'Rémy Coutable2019-09-055-7/+23
| |\ \ \ \ \ \
| | * | | | | | Add DAG to setup-test-env jobs and review-cng-base to speed up pipelinedag-setup-test-envKyle Wiebers2019-09-055-7/+23
| * | | | | | | Merge branch 'danger-review-pipeline' into 'master'Rémy Coutable2019-09-054-3/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Add Danger Roulette rules for pipeline filesdanger-review-pipelineKyle Wiebers2019-09-054-3/+23
* | | | | | | | | Merge branch 'add-approval-status-field-lm' into 'master'Rémy Coutable2019-09-0520-35/+90
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extend License Compliance entity for Pipelines and MR viewCan Eldem2019-09-0520-35/+90
|/ / / / / / / / /
* | | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-053-1/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '67037-user-content-gitlab-static-net-brings-back-404-only' into...Sean McGivern2019-09-053-1/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-onlyBrett Walker2019-09-053-1/+21
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'mk/fix-lfs-authentication-url-ee' into 'master'Rémy Coutable2019-09-054-20/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix EE overrideMichael Kozono2019-09-054-20/+29
|/ / / / / / / / /
* | | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-09-052-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /