summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entrygitaly-version-v1.42.2GitalyBot2019-05-291-0/+5
|
* Update Gitaly version to v1.42.2GitalyBot2019-05-291-1/+1
|
* Merge branch 'docs/overhaul-create-ssh-keys-page' into 'master'Achilleas Pipinellis2019-05-294-25/+26
|\ | | | | | | | | | | | | Refactor GitLab basics ssh keys docs Closes #61225 See merge request gitlab-org/gitlab-ce!28039
| * Refactor GitLab basics ssh keys docsEvan Read2019-05-294-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 Pipinellis2019-05-291-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 filterSam Beckham2019-05-291-0/+1
|/ | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12805/
* Merge branch 'docs-update-opendjk-version' into 'master'Achilleas Pipinellis2019-05-291-1/+1
|\ | | | | | | | | Updated openjdk version from 7 to 8 See merge request gitlab-org/gitlab-ce!28838
| * Updated openjdk version from 7 to 8Sara Ahbabou2019-05-291-1/+1
|/
* Merge branch '61453-helpers' into 'master'Bob Van Landuyt2019-05-296-2/+79
|\ | | | | | | | | Make external_dashboard_url available to frontend See merge request gitlab-org/gitlab-ce!28151
| * Make external_dashboard_url available to frontendReuben Pereira2019-05-296-2/+79
|/ | | | | - On Operations settings page - On Metrics dashboard page
* Merge branch 'docs/warning-about-job-traces-s3' into 'master'Achilleas Pipinellis2019-05-291-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 S3Cindy Pallares 🦉2019-05-291-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 Pipinellis2019-05-291-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 recommendedAndrew Winata2019-05-291-0/+5
|/
* Merge branch 'patch-17' into 'master'Achilleas Pipinellis2019-05-291-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 !5951Elan Ruusamäe2019-05-281-0/+1
| |
* | Merge branch 'if-10137-ee_specific_lines_protected_branches_api' into 'master'Lin Jen-Shin2019-05-292-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::ProtectedBranchesImre Farkas2019-05-292-23/+16
|/ /
* | Merge branch 'jprovazn-puma-metrics' into 'master'Kamil Trzciński2019-05-297-1/+224
|\ \ | | | | | | | | | | | | | | | | | | Add Puma sampler Closes #52769 See merge request gitlab-org/gitlab-ce!28324
| * | Add Puma samplerJan Provaznik2019-05-297-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-messageFatih Acet2019-05-2921-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 IDEDenys Mishunov2019-05-2921-244/+620
|/ / | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/60107
* | Merge branch 'vue-repo-breadcrumbs' into 'master'Filipa Lacerda2019-05-2914-69/+208
|\ \ | | | | | | | | | | | | Added repository file listing breadcrumbs See merge request gitlab-org/gitlab-ce!28706
| * | Created repository list breadcrumbs Vue appPhil Hughes2019-05-2914-69/+208
| | |
* | | Merge branch 'if-10137-ee_specific_lines_issues_api' into 'master'Yorick Peterse2019-05-292-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::IssuesImre Farkas2019-05-292-12/+10
|/ / /
* | | Merge branch 'mc/feature/reports-download' into 'master'Grzegorz Bizon2019-05-298-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-downloadMatija Čupić2019-05-284-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_reportsMatija Čupić2019-05-284-10/+13
| | | |
| * | | Move JobArtifactEntity to JobArtifactReportEntityMatija Čupić2019-05-283-3/+3
| | | |
| * | | Expose report download path in build detailsMatija Čupić2019-05-284-0/+55
| | | | | | | | | | | | | | | | Exposes report download paths in build details.
| * | | Add all reports scope to Ci::JobArtifactMatija Čupić2019-05-282-0/+19
| | | |
* | | | Merge branch 'tpresa-using-license-seat' into 'master'Sean McGivern2019-05-291-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-seatThiago Presa2019-05-281-0/+2
| | | | |
* | | | | Merge branch 'i18n-status-fix' into 'master'Bob Van Landuyt2019-05-292-4/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Remove leading whitespace on translatable string: "Status" See merge request gitlab-org/gitlab-ce!23856
| * | | | Merged changes from masterDavid Planella2019-05-288245-169066/+510137
| |\ \ \ \
| * | | | | Update .pot file with changed stringsDavid Planella2018-12-161-3/+0
| | | | | |
| * | | | | Fix leading whitespace in translatable stringDavid Planella2018-12-161-1/+1
| | | | | |
* | | | | | Merge branch 'revert-karma-timeout' into 'master'Grzegorz Bizon2019-05-292-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase karma global timeout See merge request gitlab-org/gitlab-ce!28850
| * | | | | | Increase global karma timeoutrevert-karma-timeoutHeinrich Lee Yu2019-05-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert useless timeout added in karma spec
* | | | | | | Merge branch 'repo-router-fixes' into 'master'Filipa Lacerda2019-05-295-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 URLPhil Hughes2019-05-285-11/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'patch-31' into 'master'Evan Read2019-05-291-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 namePhy2019-05-281-4/+4
| | | | | | |
* | | | | | | Merge branch '11105-fix-cs-with-proxy' into 'master'Achilleas Pipinellis2019-05-292-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 templatePhilippe Lafoucrière2019-05-292-0/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11105
* | | | | | Merge branch 'patch-49' into 'master'Evan Read2019-05-281-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 patternsRaphael Das Gupta2019-05-281-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-libraryRobert Speicher2019-05-282-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-10Thong Kuah2019-05-212-1/+6
| | | | | | |