summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify what is meant by latest stable by linking to release postsdocs/clarify-latest-stable-releaseBrendan O'Leary2018-03-291-1/+1
|
* Merge branch 'escape-autocomplete-values-for-markdown' into 'master'Phil Hughes2018-03-293-6/+28
|\ | | | | | | | | Escape autocomplete results for Markdown See merge request gitlab-org/gitlab-ce!18051
| * Escape autocomplete results for MarkdownSean McGivern2018-03-293-6/+28
| | | | | | | | | | | | | | | | | | | | A label name can contain a `_`, `~~`, or other Markdown-significant characters. But label references are processed _after_ Markdown processing has run, so we can't easily fix this on the backend. We can make it more convenient, though, by changing the frontend to escape these characters so they aren't processed as Markdown, when we insert them from autocomplete.
* | Merge branch 'patch-24' into 'master'Rémy Coutable2018-03-291-4/+4
|\ \ | | | | | | | | | | | | Recommend a `-p` while `git fetch`ing See merge request gitlab-org/gitlab-ce!18016
| * | Recommend a `--prune` while `git fetch`ingMattia Rizzolo2018-03-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Especially with the main gitlab repository, there tends to be tons of stray branches, a continue `git fetch` without any -p will easily lead to hundreds of "orphaned branches" in the local checkouts. Signed-off-by: Mattia Rizzolo <mattia@mapreri.org>
* | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-03-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update README.md (settings -> pipelines is renamed to settings -> CI / CD ) See merge request gitlab-org/gitlab-ce!18078
| * | | Update README.md (settings -> pipelines is renamed to settings -> CI / CD )Moetaz2018-03-291-1/+1
| | | |
* | | | Merge branch 'master' into 'master'Rémy Coutable2018-03-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix link to "Getting started with GitLab and DigitalOcean" page. See merge request gitlab-org/gitlab-ce!17944
| * | | | Fix link to "Getting started with GitLab and DigitalOcean" page.Bheesham Persaud2018-03-221-1/+1
| | | | |
* | | | | Merge branch 'event-api-time-limit-docs' into 'master'Rémy Coutable2018-03-291-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update events.md with time period limit documentation Closes #35912 See merge request gitlab-org/gitlab-ce!17941
| * | | | | Update events.md with time period limit documentationKyle Lemon2018-03-221-0/+4
| | | | | |
* | | | | | Update CHANGELOG.md for 10.6.2Filipa Lacerda2018-03-293-10/+8
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-03-294-1/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix background pipeline stages migration Closes #44135 See merge request gitlab-org/gitlab-ce!18076
| * | | | | | Add changelog entry for pipeline stages migration fixGrzegorz Bizon2018-03-291-0/+5
| | | | | | |
| * | | | | | Do not use STI mechanisms when migrating pipeline stagesGrzegorz Bizon2018-03-292-0/+17
| | | | | | |
| * | | | | | Increase isolation of database migrations test modelsGrzegorz Bizon2018-03-291-1/+4
| | | | | | |
* | | | | | | Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-2935-30/+645
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221
| * | | | | | | Remove Ci::Build#timeoutTomasz Maczukin2018-03-286-48/+17
| | | | | | | |
| * | | | | | | Add explicit primary key for ci_builds_metadata tableTomasz Maczukin2018-03-283-3/+6
| | | | | | | |
| * | | | | | | Change and rename behavior of save_timeout_state!Tomasz Maczukin2018-03-284-10/+33
| | | | | | | |
| * | | | | | | Refactorize ChronicDurationAttribute concernTomasz Maczukin2018-03-282-42/+33
| | | | | | | |
| * | | | | | | Refactor build_metadataTomasz Maczukin2018-03-286-28/+25
| | | | | | | |
| * | | | | | | Add validation for max_timeout in Ci::RunnerTomasz Maczukin2018-03-282-1/+5
| | | | | | | |
| * | | | | | | Add validation for chronic_duration_attr_writerTomasz Maczukin2018-03-282-19/+74
| | | | | | | |
| * | | | | | | Add tests for Ci::BuildMetadataTomasz Maczukin2018-03-281-0/+69
| | | | | | | |
| * | | | | | | Use raw value of maximum_timeout for Runner registration APITomasz Maczukin2018-03-282-4/+3
| | | | | | | |
| * | | | | | | Fix style problem in spec/requests/api/runners_spec.rbTomasz Maczukin2018-03-281-1/+1
| | | | | | | |
| * | | | | | | Add project_id column to Ci::BuildMetadataTomasz Maczukin2018-03-283-0/+19
| | | | | | | |
| * | | | | | | Rename metadata relation and methodsTomasz Maczukin2018-03-284-9/+11
| | | | | | | |
| * | | | | | | Fix sidebar_detail_row_spec.jsTomasz Maczukin2018-03-281-15/+19
| | | | | | | |
| * | | | | | | BuildMetadata styling improvementsTomasz Maczukin2018-03-282-13/+12
| | | | | | | |
| * | | | | | | Rename used_timeout to timeoutTomasz Maczukin2018-03-289-15/+15
| | | | | | | |
| * | | | | | | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-2815-39/+39
| | | | | | | |
| * | | | | | | Fix tests failuresTomasz Maczukin2018-03-284-4/+23
| | | | | | | |
| * | | | | | | Update runner registration APITomasz Maczukin2018-03-282-4/+5
| | | | | | | |
| * | | | | | | Use help_page_path helper to generate runner_help_urlTomasz Maczukin2018-03-281-1/+1
| | | | | | | |
| * | | | | | | Refactorize Ci::Build and Ci::BuildMetadata modelsTomasz Maczukin2018-03-286-36/+33
| | | | | | | |
| * | | | | | | Fix transition failure when metadata not existsTomasz Maczukin2018-03-281-1/+1
| | | | | | | |
| * | | | | | | Update tests - remove unneeded changeTomasz Maczukin2018-03-281-2/+0
| | | | | | | |
| * | | | | | | Fix static analysis offencesTomasz Maczukin2018-03-285-7/+3
| | | | | | | |
| * | | | | | | Move job timeout information to new ci_builds_metadata tableTomasz Maczukin2018-03-2815-52/+110
| | | | | | | |
| * | | | | | | Add tests for frontend changesTomasz Maczukin2018-03-283-0/+27
| | | | | | | |
| * | | | | | | Change timeout_source to enumTomasz Maczukin2018-03-286-16/+35
| | | | | | | |
| * | | | | | | Downcase timeout_source valueTomasz Maczukin2018-03-281-1/+1
| | | | | | | |
| * | | | | | | Use _human_readable for Runner's registration APITomasz Maczukin2018-03-282-4/+14
| | | | | | | |
| * | | | | | | Properly handle empty value for chronic duration attributeTomasz Maczukin2018-03-282-3/+21
| | | | | | | |
| * | | | | | | Revert change in doc/ci/runners/img/shared_runners_admin.pngTomasz Maczukin2018-03-281-0/+0
| | | | | | | |
| * | | | | | | Remove unused methodTomasz Maczukin2018-03-282-22/+0
| | | | | | | |
| * | | | | | | Refactor timeout selection mechanismTomasz Maczukin2018-03-282-8/+48
| | | | | | | |
| * | | | | | | Add few frontend improvementsTomasz Maczukin2018-03-284-3/+13
| | | | | | | |