summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Moving the analyzer stringsdocs-update-sast-analyzer-docmac-key2019-07-311-29/+13
|
* Add SAST default analyzer strings and missing SAST analyzermac-key2019-07-311-0/+17
|
* Merge branch '65317-adapt-tae-role-name-change' into 'master'Sean McGivern2019-07-314-3/+11
|\ | | | | | | | | | | | | Fix Danger finding a test reviewer Closes #65317 See merge request gitlab-org/gitlab-ce!31292
| * Use spec_helper than rails_helper65317-adapt-tae-role-name-changeLin Jen-Shin2019-07-302-2/+2
| |
| * Update regular expression to extract stage nameLin Jen-Shin2019-07-302-1/+9
| | | | | | | | | | | | | | | | Since now the role name can be: "<a href=\"/job-families/engineering/test-automation-engineer/\">Senior Test Automation Engineer</a>, Create:Source Code" We need to cope with </a> in the middle.
* | Merge branch 'add-edit-note-helper-method-pd' into 'master'Thong Kuah2019-07-311-0/+8
|\ \ | | | | | | | | | | | | Add edit_note helper method See merge request gitlab-org/gitlab-ce!31235
| * | Add edit_note helper methodadd-edit-note-helper-method-pdPatrick Derichs2019-07-311-0/+8
| | |
* | | Merge branch 'docs-code-block-style-6' into 'master'Marcia Ramos2019-07-3112-362/+383
|\ \ \ | | | | | | | | | | | | | | | | Fix whitespace in topic, university, workflow docs See merge request gitlab-org/gitlab-ce!30603
| * | | Fix whitespace in topic, university, workflow docsMarcel Amirault2019-07-3112-362/+383
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues, and cleans up minor white space issues in /topic, /university, /update and /workflow docs.
* | | Merge branch 'docs-time-tracking-update' into 'master'Marcia Ramos2019-07-311-7/+6
|\ \ \ | | | | | | | | | | | | | | | | Docs: update time tracking doc See merge request gitlab-org/gitlab-ce!30890
| * | | Update time tracking docMarcia Ramos2019-07-311-7/+6
|/ / / | | | | | | | | | | | | | | | - CORE ONLY badge - Link 'introduced in' note - Inline linking
* | | Merge branch 'mg-update-icons-svg-import' into 'master'Kushal Pandya2019-07-313-1/+20
|\ \ \ | | | | | | | | | | | | | | | | Use file-loader for sprite icons within icon.vue See merge request gitlab-org/gitlab-ce!31257
| * | | Override icons.svg asset path with sprockets assetmg-update-icons-svg-importMike Greiling2019-07-292-0/+9
| | | |
| * | | Use file-loader to import icon spritesMike Greiling2019-07-292-1/+11
| | | |
* | | | Merge branch 'docs/use-kubernetes-command' into 'master'Marcia Ramos2019-07-311-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help user to know what to do when deploying to cluster Closes #58947 See merge request gitlab-org/gitlab-ce!31318
| * | | | Help user to know what to do when deploying to clusterEvan Read2019-07-311-2/+10
|/ / / /
* | | | Merge branch 'docs/shift-geo-version-info' into 'master'Marcia Ramos2019-07-311-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move version info for Geo See merge request gitlab-org/gitlab-ce!31269
| * | | | Move version info for GeoEvan Read2019-07-311-2/+8
|/ / / /
* | | | Merge branch 'docs-code-block-style-4' into 'master'Marcia Ramos2019-07-318-728/+750
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix whitespace in dev docs See merge request gitlab-org/gitlab-ce!30599
| * | | | Fix whitespace in ci docsMarcel Amirault2019-07-318-728/+750
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues for most docs in /development, and cleans up other whitespace issues too
* | | | Merge branch '54853-update-gitlab-styles' into 'master'Rémy Coutable2019-07-312-6/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-styles to close #54853 Closes #54853 See merge request gitlab-org/gitlab-ce!31155
| * | | | Update gitlab-styles to add Lint/SafeNavigationWithEmpty54853-update-gitlab-stylesKyle Wiebers2019-07-262-6/+4
| | | | |
* | | | | Merge branch '65096-fix-validations' into 'master'James Lopez2019-07-318-29/+36
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Change validations to allow blank but not allow nil See merge request gitlab-org/gitlab-ce!31133
| * | | | Allow blank but not nil in validationsReuben Pereira2019-07-318-29/+36
|/ / / / | | | | | | | | | | | | | | | | | | | | - The most common use case for qualified_domain_validator currently is to allow blank ([]) but not allow nil. Modify the qualified_domain_validator to support this use case.
* | | | Merge branch 'fix-embeds-cache' into 'master'James Lopez2019-07-312-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure default metrics embed is cached See merge request gitlab-org/gitlab-ce!31157
| * | | | Ensure default metrics embed is cachedSarah Yasonik2019-07-312-3/+5
|/ / / /
* | | | Merge branch '57115-remove-unused-cluster-workers' into 'master'Thong Kuah2019-07-314-85/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused cluster configuration logic See merge request gitlab-org/gitlab-ce!25725
| * | | | Remove unused cluster configuration logic57115-remove-unused-cluster-workersTiger2019-07-314-85/+0
| | | | | | | | | | | | | | | | | | | | | | | | | All cluster resources are now created on demand when a deployment job starts.
* | | | | Merge branch 'docs/ssot_user_profile' into 'master'Evan Read2019-07-316-57/+176
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Edits to user Profile and Settings content See merge request gitlab-org/gitlab-ce!31128
| * | | | | Edits to user Profile and Settings contentRussell Dickenson2019-07-316-57/+176
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each of these files were edited to ensure compliance with the docs standard layout, as part of the SSOT epic. In addition, some copy editing was done, to improve clarity, and comply with the GitLab docs style guide.
* | | | | Merge branch 'qa-k8s-add-node-size' into 'master'Thong Kuah2019-07-312-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for controlling amount of nodes See merge request gitlab-org/gitlab-ce!31299
| * | | | | Add support for controlling amount of nodesDan Davison2019-07-312-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Nodes spun up in Gcloud defaults to '3' nodes This number can be a lot considering the QA autodevops spec does not need this many nodes
* | | | | Merge branch 'da-fix-small-typo-custom-hooks-docs' into 'master'Evan Read2019-07-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated words on custom hooks docs See merge request gitlab-org/gitlab-ce!31309
| * | | | | Remove duplicated wordsda-fix-small-typo-custom-hooks-docsDouglas Barbosa Alexandre2019-07-301-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'docs-ee-13016' into 'master'Evan Read2019-07-311-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add SCIM troubleshooting for Azure mapping error Closes gitlab-ee#13016 See merge request gitlab-org/gitlab-ce!31208
| * | | | | Docs: Add SCIM troubleshooting for Azure mapping errorCynthia Ng2019-07-311-0/+14
|/ / / / /
* | | | | Merge branch 'mc/doc/variable-precedence-docs' into 'master'Evan Read2019-07-311-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document multi-project variable precedence Closes gitlab-ee#12879 See merge request gitlab-org/gitlab-ce!31291
| * | | | | Document multi-project variable precedenceMatija Čupić2019-07-311-0/+5
| |/ / / /
* | | | | Merge branch 'harishsr-ldap-groupsync-rake-task-docs' into 'master'Evan Read2019-07-311-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document how to use the GroupSync rake task See merge request gitlab-org/gitlab-ce!31192
| * | | | | Document how to use the GroupSync rake taskharishsr-ldap-groupsync-rake-task-docsHarish Ramachandran2019-07-261-0/+25
| | | | | |
* | | | | | Merge branch 'parallel-docs-sempahore-example' into 'master'Evan Read2019-07-311-6/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Added Semaphore Test Boosters example to CI YAML `parallel` docs Closes #63509 See merge request gitlab-org/gitlab-ce!31067
| * | | | | | Documentation: Added Semaphore Test Boosters example to CI YAML `parallel` docsdrew2019-07-311-6/+29
|/ / / / / /
* | | | | | Merge branch 'docs/update-dind-title' into 'master'Evan Read2019-07-314-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docker title for docker-in-docker workflow See merge request gitlab-org/gitlab-ce!31273
| * | | | | | Update docker title for docker-in-docker workflowdocs/update-dind-titleSteve Azzopardi2019-07-304-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `docker-in-docker` is a workflow not an specific executor. It uses the [Docker executor](https://docs.gitlab.com/runner/executors/docker.html).
* | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Mike Greiling2019-07-302-20/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^5.11.1 See merge request gitlab-org/gitlab-ce!31176
| * | | | | | Update dependency @gitlab/ui to ^5.11.1Lukas Eipert2019-07-302-20/+14
|/ / / / / /
* | | | | | Merge branch 'ealcantara-mock-dropdown-show-event' into 'master'Mike Greiling2019-07-301-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit dropdown show event in boards_selector test See merge request gitlab-org/gitlab-ce!31255
| * | | | | | Emit dropdown show event in boards_selector testealcantara-mock-dropdown-show-eventEnrique Alcantara2019-07-301-1/+2
| | | | | | |
* | | | | | | Merge branch 'prepend-ee-helper' into 'master'Robert Speicher2019-07-305-70/+186
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add methods for injecting EE modules See merge request gitlab-org/gitlab-ce!31055
| * | | | | | | Added docs for the new EE injection methodsprepend-ee-helperYorick Peterse2019-07-301-21/+25
| | | | | | | |