Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add changelog entrygitaly-version-v1.42.2 | GitalyBot | 2019-05-29 | 1 | -0/+5 |
| | |||||
* | Update Gitaly version to v1.42.2 | GitalyBot | 2019-05-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'docs/overhaul-create-ssh-keys-page' into 'master' | Achilleas Pipinellis | 2019-05-29 | 4 | -25/+26 |
|\ | | | | | | | | | | | | | Refactor GitLab basics ssh keys docs Closes #61225 See merge request gitlab-org/gitlab-ce!28039 | ||||
| * | Refactor GitLab basics ssh keys docs | Evan Read | 2019-05-29 | 4 | -25/+26 |
|/ | | | | | Ensures we give instructions for how to create ssh keys in a single place only. | ||||
* | Merge branch 'gsd-confidence-filter-ce' into 'master' | Achilleas Pipinellis | 2019-05-29 | 1 | -0/+1 |
|\ | | | | | | | | | Adds the CE port for the confidence filter See merge request gitlab-org/gitlab-ce!28410 | ||||
| * | Adds the CE port for the confidence filter | Sam Beckham | 2019-05-29 | 1 | -0/+1 |
|/ | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12805/ | ||||
* | Merge branch 'docs-update-opendjk-version' into 'master' | Achilleas Pipinellis | 2019-05-29 | 1 | -1/+1 |
|\ | | | | | | | | | Updated openjdk version from 7 to 8 See merge request gitlab-org/gitlab-ce!28838 | ||||
| * | Updated openjdk version from 7 to 8 | Sara Ahbabou | 2019-05-29 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '61453-helpers' into 'master' | Bob Van Landuyt | 2019-05-29 | 6 | -2/+79 |
|\ | | | | | | | | | Make external_dashboard_url available to frontend See merge request gitlab-org/gitlab-ce!28151 | ||||
| * | Make external_dashboard_url available to frontend | Reuben Pereira | 2019-05-29 | 6 | -2/+79 |
|/ | | | | | - On Operations settings page - On Metrics dashboard page | ||||
* | Merge branch 'docs/warning-about-job-traces-s3' into 'master' | Achilleas Pipinellis | 2019-05-29 | 1 | -0/+3 |
|\ | | | | | | | | | Add warning about CI traces when enabling S3 See merge request gitlab-org/gitlab-ce!28734 | ||||
| * | Add warning about CI traces when enabling S3 | Cindy Pallares 🦉 | 2019-05-29 | 1 | -0/+3 |
|/ | | | | | Traces may go missing when they're saved in the builds folder and moved to the local artifacts folder in HA set ups. | ||||
* | Merge branch 'docs-avoid-CephFS-GlusterFS' into 'master' | Achilleas Pipinellis | 2019-05-29 | 1 | -0/+5 |
|\ | | | | | | | | | | | | | Info on Ceph and Gluster FS not recommended Closes gitlab-com/support/support-team-meta#1562 See merge request gitlab-org/gitlab-ce!26806 | ||||
| * | Info on Ceph and Gluster FS not recommended | Andrew Winata | 2019-05-29 | 1 | -0/+5 |
|/ | |||||
* | Merge branch 'patch-17' into 'master' | Achilleas Pipinellis | 2019-05-29 | 1 | -0/+1 |
|\ | | | | | | | | | doc: personal_access_tokens: add missing link to !5951 See merge request gitlab-org/gitlab-ce!28819 | ||||
| * | doc: personal_access_tokens: add missing link to !5951 | Elan Ruusamäe | 2019-05-28 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'if-10137-ee_specific_lines_protected_branches_api' into 'master' | Lin Jen-Shin | 2019-05-29 | 2 | -23/+16 |
|\ \ | | | | | | | | | | | | | CE port of Move EE specific lines in API::ProtectedBranches See merge request gitlab-org/gitlab-ce!28721 | ||||
| * | | CE port of Move EE specific lines in API::ProtectedBranches | Imre Farkas | 2019-05-29 | 2 | -23/+16 |
|/ / | |||||
* | | Merge branch 'jprovazn-puma-metrics' into 'master' | Kamil Trzciński | 2019-05-29 | 7 | -1/+224 |
|\ \ | | | | | | | | | | | | | | | | | | | Add Puma sampler Closes #52769 See merge request gitlab-org/gitlab-ce!28324 | ||||
| * | | Add Puma sampler | Jan Provaznik | 2019-05-29 | 7 | -1/+224 |
|/ / | | | | | | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then. | ||||
* | | Merge branch '45687-web-ide-empty-state' into 'master'52580-update-color-coding-of-you-are-already-signed-in-flash-message | Fatih Acet | 2019-05-29 | 21 | -244/+620 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "WebIDE doesn't work on empty repositories" Closes #60107 and #45687 See merge request gitlab-org/gitlab-ce!26556 | ||||
| * | | Updated heading for default state in Web IDE | Denys Mishunov | 2019-05-29 | 21 | -244/+620 |
|/ / | | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/60107 | ||||
* | | Merge branch 'vue-repo-breadcrumbs' into 'master' | Filipa Lacerda | 2019-05-29 | 14 | -69/+208 |
|\ \ | | | | | | | | | | | | | Added repository file listing breadcrumbs See merge request gitlab-org/gitlab-ce!28706 | ||||
| * | | Created repository list breadcrumbs Vue app | Phil Hughes | 2019-05-29 | 14 | -69/+208 |
| | | | |||||
* | | | Merge branch 'if-10137-ee_specific_lines_issues_api' into 'master' | Yorick Peterse | 2019-05-29 | 2 | -12/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::Issues See merge request gitlab-org/gitlab-ce!28725 | ||||
| * | | | CE port of Move EE specific lines in API::Issues | Imre Farkas | 2019-05-29 | 2 | -12/+10 |
|/ / / | |||||
* | | | Merge branch 'mc/feature/reports-download' into 'master' | Grzegorz Bizon | 2019-05-29 | 8 | -2/+97 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Allow downloading report artifacts Closes #49265 See merge request gitlab-org/gitlab-ce!27974 | ||||
| * | | | Extract Ci::Build#report_artifacts into methodmc/feature/reports-download | Matija Čupić | 2019-05-28 | 4 | -4/+22 |
| | | | | | | | | | | | | | | | | | | | | Extracts combining the job_artifacts relation with the with_reports scope for getting report artifacts into a method. | ||||
| * | | | Rename with_all_reports to with_reports | Matija Čupić | 2019-05-28 | 4 | -10/+13 |
| | | | | |||||
| * | | | Move JobArtifactEntity to JobArtifactReportEntity | Matija Čupić | 2019-05-28 | 3 | -3/+3 |
| | | | | |||||
| * | | | Expose report download path in build details | Matija Čupić | 2019-05-28 | 4 | -0/+55 |
| | | | | | | | | | | | | | | | | Exposes report download paths in build details. | ||||
| * | | | Add all reports scope to Ci::JobArtifact | Matija Čupić | 2019-05-28 | 2 | -0/+19 |
| | | | | |||||
* | | | | Merge branch 'tpresa-using-license-seat' into 'master' | Sean McGivern | 2019-05-29 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Show if a user is using a license seat See merge request gitlab-org/gitlab-ce!28790 | ||||
| * | | | | Show if a user is using a license seattpresa-using-license-seat | Thiago Presa | 2019-05-28 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'i18n-status-fix' into 'master' | Bob Van Landuyt | 2019-05-29 | 2 | -4/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Remove leading whitespace on translatable string: "Status" See merge request gitlab-org/gitlab-ce!23856 | ||||
| * | | | | Merged changes from master | David Planella | 2019-05-28 | 8245 | -169066/+510137 |
| |\ \ \ \ | |||||
| * | | | | | Update .pot file with changed strings | David Planella | 2018-12-16 | 1 | -3/+0 |
| | | | | | | |||||
| * | | | | | Fix leading whitespace in translatable string | David Planella | 2018-12-16 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'revert-karma-timeout' into 'master' | Grzegorz Bizon | 2019-05-29 | 2 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase karma global timeout See merge request gitlab-org/gitlab-ce!28850 | ||||
| * | | | | | | Increase global karma timeoutrevert-karma-timeout | Heinrich Lee Yu | 2019-05-29 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert useless timeout added in karma spec | ||||
* | | | | | | | Merge branch 'repo-router-fixes' into 'master' | Filipa Lacerda | 2019-05-29 | 5 | -11/+17 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes repository Vue router hiding elements on root URL See merge request gitlab-org/gitlab-ce!28821 | ||||
| * | | | | | | | Fixes repository Vue router hiding elements on root URL | Phil Hughes | 2019-05-28 | 5 | -11/+17 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'patch-31' into 'master' | Evan Read | 2019-05-29 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Correct CI_API_V4_URL CI variable name See merge request gitlab-org/gitlab-ce!28849 | ||||
| * | | | | | | Correct CI_API_V4_URL CI variable name | Phy | 2019-05-28 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch '11105-fix-cs-with-proxy' into 'master' | Achilleas Pipinellis | 2019-05-29 | 2 | -0/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable proxy in container scanning template Closes gitlab-ee#11105 See merge request gitlab-org/gitlab-ce!27246 | ||||
| * | | | | | | Disable proxy in container scanning template | Philippe Lafoucrière | 2019-05-29 | 2 | -0/+8 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11105 | ||||
* | | | | | | Merge branch 'patch-49' into 'master' | Evan Read | 2019-05-28 | 1 | -6/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation of RegExp in CI/CD job ref patterns See merge request gitlab-org/gitlab-ce!28139 | ||||
| * | | | | | | Improve documentation of RegExp in CI/CD job ref patterns | Raphael Das Gupta | 2019-05-28 | 1 | -6/+23 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | as requested by https://gitlab.com/gitlab-org/gitlab-ce/issues/30477#note_29060568 in #30477 | ||||
* | | | | | | Merge branch 'auto-devops-kubernestes-bump1-11-10' into 'master'61146-style-tertiary-button-type-to-be-aligned-with-pattern-library | Robert Speicher | 2019-05-28 | 2 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps Kubernetes in Auto DevOps to 1.11.10 See merge request gitlab-org/gitlab-ce!28525 | ||||
| * | | | | | | Bumps Kubernetes version to 1.11.10auto-devops-kubernestes-bump1-11-10 | Thong Kuah | 2019-05-21 | 2 | -1/+6 |
| | | | | | | |