summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply suggestion to doc/administration/pages/index.mdletsencrypt-documentationVladimir Shushlin2019-07-161-1/+1
|
* Apply suggestion to doc/administration/pages/index.mdVladimir Shushlin2019-07-161-1/+1
|
* Apply suggestion to doc/administration/pages/index.mdVladimir Shushlin2019-07-161-1/+1
|
* Apply suggestion to doc/administration/pages/index.mdVladimir Shushlin2019-07-161-1/+1
|
* Apply suggestion to doc/administration/pages/index.mdVladimir Shushlin2019-07-161-3/+3
|
* Add docs for Let's Encrypt integrationVladimir Shushlin2019-07-168-6/+105
| | | | | | * Add deprecation warning to old integration * Add user docs * Add admin docs
* Merge branch '63082-specs-changes' into 'master'Jan Provaznik2019-07-167-38/+21
|\ | | | | | | | | Simplify factories for services See merge request gitlab-org/gitlab-ce!30611
| * Fix message for successful jira testJarka Košanová2019-07-161-1/+1
| |
| * Simplify factories for servicesJarka Košanová2019-07-166-37/+20
| | | | | | | | | | | | - use predefined factories when creating projects with services - remove unnecessary arguments
* | Merge branch 'zj-update-proto' into 'master'Douwe Maan2019-07-163-4/+4
|\ \ | | | | | | | | | | | | Upgrade Gitaly-Proto to 1.37.0 See merge request gitlab-org/gitlab-ce!30774
| * | Upgrade Gitaly-Proto to 1.37.0Zeger-Jan van de Weg2019-07-163-4/+4
| | | | | | | | | | | | | | | This was done to perform some local testing, but while the change was already made it made sense to commit the change.
* | | Merge branch 'remove-complex-expressions-feature-flag' into 'master'Kamil Trzciński2019-07-166-172/+11
|\ \ \ | | | | | | | | | | | | | | | | Removing ci_variables_complex_expressions feature flag and deprecated code branches See merge request gitlab-org/gitlab-ce!30717
| * | | Removing ci_variables_complex_expressions feature flag and deprecated code ↵remove-complex-expressions-feature-flagdrew cimino2019-07-126-172/+11
| | | | | | | | | | | | | | | | branches
* | | | Merge branch '61342-commit-search-result-doesn-t-pass-wcag-color-audit' into ↵Paul Slaughter2019-07-162-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Commit search result doesn't pass WCAG color audit" Closes #61342 See merge request gitlab-org/gitlab-ce!30312
| * | | | Change color for project namespace to light grayMarcel van Remmerden2019-07-162-1/+6
|/ / / /
* | | | Merge branch 'bw-enhance-rake-seed' into 'master'James Lopez2019-07-161-2/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Allow parameters for rake gitlab:seed:issues See merge request gitlab-org/gitlab-ce!30689
| * | | Allow parameters for rake gitlab:seed:issuesbw-enhance-rake-seedBrett Walker2019-07-151-2/+5
| | | | | | | | | | | | | | | | to specify backfill_weeks and average_issues_per_week
* | | | Merge branch 'pl-json_response-ce' into 'master'Grzegorz Bizon2019-07-1633-111/+63
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Backport "Cleanup usages of `JSON.parse` in specs" See merge request gitlab-org/gitlab-ce!30712
| * | | Cleanup usages of `JSON.parse` in specsPeter Leitzen2019-07-1633-111/+63
|/ / / | | | | | | | | | Prefer `json_response` where applicable.
* | | Merge branch '59875-stylelint-panels' into 'master'Phil Hughes2019-07-163-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed style-lint errors for `panels.scss` Closes #59875 See merge request gitlab-org/gitlab-ce!30748
| * | | Fixed style-lint errors for `panels.scss`59875-stylelint-panelsDenys Mishunov2019-07-153-3/+2
| | | | | | | | | | | | | | | | | | | | Removed @extend from SCSS file in favor of directly assigning CSS class in corresponding HTML snippets.
* | | | Merge branch 'docs/avoid-using-square-brackets' into 'master'Achilleas Pipinellis2019-07-161-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rewrite to avoid square brackets, minimizing Kramdown warnings See merge request gitlab-org/gitlab-ce!30773
| * | | | Rewrite to avoid square brackets, minimizing Kramdown warningsEvan Read2019-07-161-3/+3
|/ / / /
* | | | Merge branch 'rake-db-migrate-status-docs' into 'master'Achilleas Pipinellis2019-07-161-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document db:migrate:status rake task Closes #63908 See merge request gitlab-org/gitlab-ce!30202
| * | | | Document db:migrate:status rake taskGreg Myers2019-07-161-0/+19
|/ / / /
* | | | Merge branch 'docs-update-ES-indexer-omnibus' into 'master'Achilleas Pipinellis2019-07-161-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ES indexer docs for Omnibus users Closes #63207 See merge request gitlab-org/gitlab-ce!29731
| * | | | Update ES indexer docs for Omnibus usersGreg Myers2019-07-161-1/+5
|/ / / /
* | | | Merge branch 'mh/mermaid-linebreaks' into 'master'Kushal Pandya2019-07-163-1/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linebreak rendering in Mermaid flowcharts Closes #54588 See merge request gitlab-org/gitlab-ce!30730
| * | | | Fix linebreak rendering in Mermaid flowchartsMartin Hanzel2019-07-163-1/+25
|/ / / /
* | | | Merge branch 'docs/security-follow-up' into 'master'Achilleas Pipinellis2019-07-1610-29/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clean-up some confusing info from security docs See merge request gitlab-org/gitlab-ce!29495
| * | | | Clean-up some confusing info from security docsAchilleas Pipinellis2019-07-1610-29/+56
|/ / / /
* | | | Merge branch 'docs/use-plain-text-and-markdown' into 'master'Achilleas Pipinellis2019-07-161-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid using HTML when plain text and markdown work See merge request gitlab-org/gitlab-ce!30768
| * | | | Avoid using HTML when plain text and markdown workEvan Read2019-07-161-10/+10
|/ / / /
* | | | Merge branch 'jc-documentation-update-nfs-autodetection' into 'master'Achilleas Pipinellis2019-07-161-18/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nfs autodetection section in NFS docs Closes gitaly#1767 See merge request gitlab-org/gitlab-ce!30486
| * | | | Add nfs autodetection section in NFS docsjc-documentation-update-nfs-autodetectionJohn Cai2019-07-121-18/+4
| | | | |
* | | | | Merge branch 'pl-fix-styleguide-link' into 'master'Achilleas Pipinellis2019-07-162-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix links to documentation styleguide See merge request gitlab-org/gitlab-ce!30732
| * | | | | Fix link pointing to the documentation styleguidePeter Leitzen2019-07-162-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Using the old link redirects to https://docs.gitlab.com/ee/development/documentation/index.html which does not show the mentioned documentation.
* | | | | Merge branch 'add-default-docs' into 'master'Evan Read2019-07-162-21/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usage of `default:` Closes #63351 See merge request gitlab-org/gitlab-ce!30677
| * | | | | Add usage of `default:`add-default-docsKamil Trzciński2019-07-152-21/+75
| | | | | |
* | | | | | Merge branch 'mc/docs/api-download-latest-artifact-docs' into 'master'Evan Read2019-07-161-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update job artifact download docs See merge request gitlab-org/gitlab-ce!30714
| * | | | | | Update job artifact download docsmc/docs/api-download-latest-artifact-docsMatija Čupić2019-07-141-7/+7
| | | | | | |
* | | | | | | Merge branch 'mc/doc/enforce-template-inclusion-docs' into 'master'Evan Read2019-07-162-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create docs for required pipeline config See merge request gitlab-org/gitlab-ce!30660
| * | | | | | | Create docs for required pipeline configmc/doc/enforce-template-inclusion-docsScott Hampton2019-07-152-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the https://gitlab.com/gitlab-org/gitlab-ee/issues/8429 issue for the required pipeline configuration setting.
* | | | | | | | Merge branch 'pl-uninstall-button-qa' into 'master'Ramya Authappan2019-07-162-7/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for "Uninstall" button reducing friction See merge request gitlab-org/gitlab-ce!30713
| * | | | | | | | Check for "Uninstall" button reducing frictionPeter Leitzen2019-07-162-7/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/prom-proj-dashboards' into 'master'Evan Read2019-07-161-46/+71
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the Prometheus custom dashboards docs See merge request gitlab-org/gitlab-ce!30582
| * | | | | | | | Clean up the Prometheus custom dashboards docsAchilleas Pipinellis2019-07-161-46/+71
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Place all under one section - Fix Markdown
* | | | | | | | Merge branch ↵Evan Read2019-07-161-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/12733-docs-using-multiple-extends-in-gitlab-ci-yml-introduced-in-gitlab-12' into 'master' Specify what version of multiple extends in docs Closes gitlab-ee#12733 See merge request gitlab-org/gitlab-ce!30667
| * | | | | | | | Specify what version of multiple extends in docsdocs/12733-docs-using-multiple-extends-in-gitlab-ci-yml-introduced-in-gitlab-12Steve Azzopardi2019-07-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first MVC of `extends` did not support a job having multiple extends, this was added in GitLab 12.0. closes https://gitlab.com/gitlab-org/gitlab-ee/issues/12733
* | | | | | | | | Merge branch 'docs/ssot-admin-ha' into 'master'Mike Lewis2019-07-1613-7/+115
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT for administration/high_availability docs Closes #64560 See merge request gitlab-org/gitlab-ce!30729