summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* always return a gitlab-local url for the avatars44775-avatar-on-os-fails-with-cdnMicaël Bergeron2018-04-043-30/+8
|
* add changelogMicaël Bergeron2018-03-291-0/+5
|
* make the remote avatar return the full URLMicaël Bergeron2018-03-292-2/+41
|
* Merge branch 'docs-fix-per-runner-timeout-section' into 'master'44805-rename-custom-metric-section-headersAchilleas Pipinellis2018-03-291-1/+1
|\ | | | | | | | | Fix documentation introduced in gitlab-org/gitlab-ce!17221 See merge request gitlab-org/gitlab-ce!18087
| * Fix documentation introduced in gitlab-org/gitlab-ce!17221Tomasz Maczukin2018-03-291-1/+1
| |
* | Merge branch 'brancho/gitlab-ce-Link_to_project_labels_page' into 'master'Sean McGivern2018-03-292-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Always display Labels section in issuable sidebar, even when the project has no labels Closes #23472 See merge request gitlab-org/gitlab-ce!18081
| * | Always display Labels section in issuable sidebar, even when the project has ↵brancho/gitlab-ce-Link_to_project_labels_pageBranka Martinovic2018-03-292-1/+6
| | | | | | | | | | | | | | | | | | no labels Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'vuex-action-helper-correctly-fail' into 'master'Tim Zallmann2018-03-293-112/+246
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly fail Vuex action helper Closes #44735 See merge request gitlab-org/gitlab-ce!18072
| * | | Add dispatch mock to the test helpervuex-action-helper-correctly-failFilipa Lacerda2018-03-293-12/+62
| | | |
| * | | fixed failinng tests after helper changePhil Hughes2018-03-293-101/+185
| | | |
| * | | Use `toEqual` for the matchersFilipa Lacerda2018-03-291-3/+3
| | | |
| * | | Correctly fail Vuex action helperPhil Hughes2018-03-291-1/+1
| | | |
* | | | Merge branch 'update-todos-docs' into 'master'Sean McGivern2018-03-291-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update todos docs to say will trigger when commenting on a commit See merge request gitlab-org/gitlab-ce!18083
| * | | | Update todos to say will trigger when commenting on a commitVictor Wu2018-03-291-2/+1
| | |_|/ | |/| |
* | | | Merge branch 'docs/google-kubernetes-engine' into 'master'Marcia Ramos2018-03-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Container to Kubernetes in Google integration docs Closes #44685 See merge request gitlab-org/gitlab-ce!18010
| * | | | Change Container to Kubernetes in Google integration docsdocs/google-kubernetes-engineAchilleas Pipinellis2018-03-271-1/+1
| | | | |
* | | | | Merge branch 'fix-issue-closing-pattern-docs' into 'master'Achilleas Pipinellis2018-03-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in issue closing pattern docs Closes omnibus-gitlab#3351 See merge request gitlab-org/gitlab-ce!18080
| * | | | | Fix typo in issue closing pattern docsBalasankar "Balu" C2018-03-291-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'docs/clarify-latest-stable-release' into 'master'Achilleas Pipinellis2018-03-291-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Clarify what is meant by latest stable by linking to release posts See merge request gitlab-org/gitlab-ce!18085
| * | | | 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
| | | | | | | | | |