summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* fix a future conflictMicaël Bergeron2018-03-291-1/+2
* fix rake migration task from ignoring Upload(store: nil)Micaël Bergeron2018-03-291-3/+14
* Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-03-292-1/+20
|\
| * Do not use STI mechanisms when migrating pipeline stagesGrzegorz Bizon2018-03-291-0/+16
| * 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-2911-12/+353
|\ \
| * | Remove Ci::Build#timeoutTomasz Maczukin2018-03-283-41/+12
| * | Change and rename behavior of save_timeout_state!Tomasz Maczukin2018-03-282-7/+30
| * | Refactorize ChronicDurationAttribute concernTomasz Maczukin2018-03-281-11/+13
| * | Refactor build_metadataTomasz Maczukin2018-03-282-9/+10
| * | Add validation for max_timeout in Ci::RunnerTomasz Maczukin2018-03-281-1/+1
| * | Add validation for chronic_duration_attr_writerTomasz Maczukin2018-03-281-15/+51
| * | Add tests for Ci::BuildMetadataTomasz Maczukin2018-03-281-0/+69
| * | Use raw value of maximum_timeout for Runner registration APITomasz Maczukin2018-03-281-1/+1
| * | Fix style problem in spec/requests/api/runners_spec.rbTomasz Maczukin2018-03-281-1/+1
| * | Rename metadata relation and methodsTomasz Maczukin2018-03-282-3/+3
| * | Fix sidebar_detail_row_spec.jsTomasz Maczukin2018-03-281-15/+19
| * | BuildMetadata styling improvementsTomasz Maczukin2018-03-281-8/+7
| * | Rename used_timeout to timeoutTomasz Maczukin2018-03-283-5/+5
| * | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-284-16/+16
| * | Fix tests failuresTomasz Maczukin2018-03-283-2/+21
| * | Update runner registration APITomasz Maczukin2018-03-281-2/+2
| * | Refactorize Ci::Build and Ci::BuildMetadata modelsTomasz Maczukin2018-03-281-3/+7
| * | Update tests - remove unneeded changeTomasz Maczukin2018-03-281-2/+0
| * | Fix static analysis offencesTomasz Maczukin2018-03-282-2/+2
| * | Move job timeout information to new ci_builds_metadata tableTomasz Maczukin2018-03-284-7/+7
| * | Add tests for frontend changesTomasz Maczukin2018-03-283-0/+27
| * | Change timeout_source to enumTomasz Maczukin2018-03-281-9/+7
| * | Use _human_readable for Runner's registration APITomasz Maczukin2018-03-281-2/+12
| * | Properly handle empty value for chronic duration attributeTomasz Maczukin2018-03-281-2/+14
| * | Remove unused methodTomasz Maczukin2018-03-281-18/+0
| * | Refactor timeout selection mechanismTomasz Maczukin2018-03-281-0/+46
| * | Add styling improvements in specsTomasz Maczukin2018-03-281-3/+6
| * | Replace user_readable with human_readableTomasz Maczukin2018-03-281-2/+2
| * | Show timeout information on job's pageTomasz Maczukin2018-03-283-17/+38
| * | Rename job_upper_timeout to maximum_job_timeoutTomasz Maczukin2018-03-284-17/+17
| * | Add ChroniDurationAttribute concernTomasz Maczukin2018-03-281-0/+28
| * | Override project-defined timeout with runner-defined oneTomasz Maczukin2018-03-283-1/+76
| * | Add support for job_upper_timeout in APITomasz Maczukin2018-03-282-1/+14
* | | Merge branch 'ac/fix-use_file-race' into 'master'Kamil Trzciński2018-03-292-2/+38
|\ \ \
| * | | Add Gitlab::ExclusiveLease to ObjectStorage#use_fileAlessio Caiazza2018-03-292-2/+38
| |/ /
* | | Merge branch 'jivl-change-copy-text-promote-milestones-labels' into 'master'Sean McGivern2018-03-293-3/+5
|\ \ \ | |_|/ |/| |
| * | Fix middle alignment for the titleJose Ivan Vargas2018-03-281-1/+1
| * | Fix promoting labels and milestones copy textJose Ivan Vargas2018-03-283-3/+5
* | | Merge branch 'dm-deploy-keys-default-user' into 'master'Sean McGivern2018-03-293-1/+26
|\ \ \
| * | | Don’t delete deploy key when user who created it is deletedDouwe Maan2018-03-281-1/+1
| * | | Fall back on ghost user when deploy key user is not setDouwe Maan2018-03-281-0/+21
| * | | Set user when adding deploy key to project using APIDouwe Maan2018-03-281-0/+4
* | | | Merge branch 'add-canary-favicon' into 'master'Sean McGivern2018-03-292-0/+10
|\ \ \ \
| * | | | Be explicit about when yellow favicon is usedEric Eastwood2018-03-281-1/+1
View Lorry Controller Status