Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vuex-action-helper-correctly-fail' into 'master' | Tim Zallmann | 2018-03-29 | 3 | -112/+246 |
|\ | |||||
| * | Add dispatch mock to the test helpervuex-action-helper-correctly-fail | Filipa Lacerda | 2018-03-29 | 3 | -12/+62 |
| * | fixed failinng tests after helper change | Phil Hughes | 2018-03-29 | 3 | -101/+185 |
| * | Use `toEqual` for the matchers | Filipa Lacerda | 2018-03-29 | 1 | -3/+3 |
| * | Correctly fail Vuex action helper | Phil Hughes | 2018-03-29 | 1 | -1/+1 |
* | | Merge branch 'escape-autocomplete-values-for-markdown' into 'master' | Phil Hughes | 2018-03-29 | 1 | -1/+9 |
|\ \ | |||||
| * | | Escape autocomplete results for Markdown | Sean McGivern | 2018-03-29 | 1 | -1/+9 |
* | | | Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master' | Kamil Trzciński | 2018-03-29 | 2 | -1/+20 |
|\ \ \ | |||||
| * | | | Do not use STI mechanisms when migrating pipeline stages | Grzegorz Bizon | 2018-03-29 | 1 | -0/+16 |
| * | | | Increase isolation of database migrations test models | Grzegorz Bizon | 2018-03-29 | 1 | -1/+4 |
* | | | | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 11 | -12/+353 |
|\ \ \ \ | |||||
| * | | | | Remove Ci::Build#timeout | Tomasz Maczukin | 2018-03-28 | 3 | -41/+12 |
| * | | | | Change and rename behavior of save_timeout_state! | Tomasz Maczukin | 2018-03-28 | 2 | -7/+30 |
| * | | | | Refactorize ChronicDurationAttribute concern | Tomasz Maczukin | 2018-03-28 | 1 | -11/+13 |
| * | | | | Refactor build_metadata | Tomasz Maczukin | 2018-03-28 | 2 | -9/+10 |
| * | | | | Add validation for max_timeout in Ci::Runner | Tomasz Maczukin | 2018-03-28 | 1 | -1/+1 |
| * | | | | Add validation for chronic_duration_attr_writer | Tomasz Maczukin | 2018-03-28 | 1 | -15/+51 |
| * | | | | Add tests for Ci::BuildMetadata | Tomasz Maczukin | 2018-03-28 | 1 | -0/+69 |
| * | | | | Use raw value of maximum_timeout for Runner registration API | Tomasz Maczukin | 2018-03-28 | 1 | -1/+1 |
| * | | | | Fix style problem in spec/requests/api/runners_spec.rb | Tomasz Maczukin | 2018-03-28 | 1 | -1/+1 |
| * | | | | Rename metadata relation and methods | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| * | | | | Fix sidebar_detail_row_spec.js | Tomasz Maczukin | 2018-03-28 | 1 | -15/+19 |
| * | | | | BuildMetadata styling improvements | Tomasz Maczukin | 2018-03-28 | 1 | -8/+7 |
| * | | | | Rename used_timeout to timeout | Tomasz Maczukin | 2018-03-28 | 3 | -5/+5 |
| * | | | | Rename maximum_job_timeout to maximum_timeout | Tomasz Maczukin | 2018-03-28 | 4 | -16/+16 |
| * | | | | Fix tests failures | Tomasz Maczukin | 2018-03-28 | 3 | -2/+21 |
| * | | | | Update runner registration API | Tomasz Maczukin | 2018-03-28 | 1 | -2/+2 |
| * | | | | Refactorize Ci::Build and Ci::BuildMetadata models | Tomasz Maczukin | 2018-03-28 | 1 | -3/+7 |
| * | | | | Update tests - remove unneeded change | Tomasz Maczukin | 2018-03-28 | 1 | -2/+0 |
| * | | | | Fix static analysis offences | Tomasz Maczukin | 2018-03-28 | 2 | -2/+2 |
| * | | | | Move job timeout information to new ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 4 | -7/+7 |
| * | | | | Add tests for frontend changes | Tomasz Maczukin | 2018-03-28 | 3 | -0/+27 |
| * | | | | Change timeout_source to enum | Tomasz Maczukin | 2018-03-28 | 1 | -9/+7 |
| * | | | | Use _human_readable for Runner's registration API | Tomasz Maczukin | 2018-03-28 | 1 | -2/+12 |
| * | | | | Properly handle empty value for chronic duration attribute | Tomasz Maczukin | 2018-03-28 | 1 | -2/+14 |
| * | | | | Remove unused method | Tomasz Maczukin | 2018-03-28 | 1 | -18/+0 |
| * | | | | Refactor timeout selection mechanism | Tomasz Maczukin | 2018-03-28 | 1 | -0/+46 |
| * | | | | Add styling improvements in specs | Tomasz Maczukin | 2018-03-28 | 1 | -3/+6 |
| * | | | | Replace user_readable with human_readable | Tomasz Maczukin | 2018-03-28 | 1 | -2/+2 |
| * | | | | Show timeout information on job's page | Tomasz Maczukin | 2018-03-28 | 3 | -17/+38 |
| * | | | | Rename job_upper_timeout to maximum_job_timeout | Tomasz Maczukin | 2018-03-28 | 4 | -17/+17 |
| * | | | | Add ChroniDurationAttribute concern | Tomasz Maczukin | 2018-03-28 | 1 | -0/+28 |
| * | | | | Override project-defined timeout with runner-defined one | Tomasz Maczukin | 2018-03-28 | 3 | -1/+76 |
| * | | | | Add support for job_upper_timeout in API | Tomasz Maczukin | 2018-03-28 | 2 | -1/+14 |
* | | | | | Merge branch 'ac/fix-use_file-race' into 'master' | Kamil Trzciński | 2018-03-29 | 2 | -2/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Add Gitlab::ExclusiveLease to ObjectStorage#use_file | Alessio Caiazza | 2018-03-29 | 2 | -2/+38 |
| |/ / / / | |||||
* | | | | | Merge branch 'jivl-change-copy-text-promote-milestones-labels' into 'master' | Sean McGivern | 2018-03-29 | 3 | -3/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix middle alignment for the title | Jose Ivan Vargas | 2018-03-28 | 1 | -1/+1 |
| * | | | | Fix promoting labels and milestones copy text | Jose Ivan Vargas | 2018-03-28 | 3 | -3/+5 |
* | | | | | Merge branch 'dm-deploy-keys-default-user' into 'master' | Sean McGivern | 2018-03-29 | 3 | -1/+26 |
|\ \ \ \ \ |