summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into update-droplab-to-webpack-versionupdate-droplab-to-webpack-versionLuke "Jared" Bennett2017-04-07466-2918/+9189
|\
| * Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil TrzciƄski2017-04-0735-160/+550
| |\
| | * Fix bad conflict resolutionLin Jen-Shin2017-04-071-6/+5
| | * Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-07208-1080/+2267
| | |\
| | * \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-07246-1551/+6072
| | |\ \
| | * | | Make sure that's canceledLin Jen-Shin2017-04-071-1/+1
| | * | | Fix test by ignoring auto_canceled_by for jobsLin Jen-Shin2017-04-071-3/+4
| | * | | Fix typoLin Jen-Shin2017-04-071-1/+1
| | * | | Fix rubocop offenses8998_skip_pending_commits_if_not_headLin Jen-Shin2017-04-062-2/+2
| | * | | Bump schema versionLin Jen-Shin2017-04-061-1/+1
| | * | | Use before_transitionLin Jen-Shin2017-04-061-4/+4
| | * | | Add missing tests and update test descriptionLin Jen-Shin2017-04-063-1/+3
| | * | | We don't have to save, transition would save for usLin Jen-Shin2017-04-061-1/+1
| | * | | Also track auto-cancelling in jobs, detail:Lin Jen-Shin2017-04-0614-27/+143
| | * | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-06147-214/+1525
| | |\ \ \
| | * | | | Fix a view test by using presenterLin Jen-Shin2017-04-061-1/+1
| | * | | | Fix rolling back for MySQLLin Jen-Shin2017-04-064-57/+2
| | * | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-06206-891/+54440
| | |\ \ \ \
| | * | | | | Add a test to make sure it's not auto-cancelingLin Jen-Shin2017-04-061-10/+24
| | * | | | | Add test for presentersLin Jen-Shin2017-04-064-4/+90
| | * | | | | Add tests for relations and scopes, and settingLin Jen-Shin2017-04-063-0/+25
| | * | | | | Restore schemaLin Jen-Shin2017-04-051-6/+6
| | * | | | | Remove tooltip from API and vue, follow up:Lin Jen-Shin2017-04-062-11/+1
| | * | | | | Fix test and only show job status title if it'sLin Jen-Shin2017-04-054-41/+54
| | * | | | | replaced one more helper with presenterRydkin Maxim2017-04-042-2/+2
| | * | | | | extract build.pipeline as variableRydkin Maxim2017-04-041-5/+6
| | * | | | | replace helper with decoratorRydkin Maxim2017-04-044-10/+9
| | * | | | | split up migrationsRydkin Maxim2017-04-042-15/+42
| | * | | | | rename pipeline_presenterRydkin Maxim2017-04-043-3/+3
| | * | | | | remove unnecessary spaceRydkin Maxim2017-04-041-1/+1
| | * | | | | remove redundant `pipeline`Rydkin Maxim2017-04-041-1/+1
| | * | | | | fix migration errorRydkin Maxim2017-04-041-1/+1
| | * | | | | add presenter for status badgeRydkin Maxim2017-04-043-2/+15
| | * | | | | replace on_delete in migration with database type related expressionRydkin Maxim2017-04-041-1/+8
| | * | | | | refactor specRydkin Maxim2017-04-041-10/+7
| | * | | | | remove `a pending pipeline` shared exampleRydkin Maxim2017-04-041-7/+3
| | * | | | | fix linter errorRydkin Maxim2017-04-041-1/+1
| | * | | | | add tooltip on badge in pipelines indexRydkin Maxim2017-04-042-1/+11
| | * | | | | adds tooltips into several placesRydkin Maxim2017-04-045-7/+12
| | * | | | | fix fallen import_export specRydkin Maxim2017-04-041-0/+2
| | * | | | | fix rubocopRydkin Maxim2017-04-041-5/+5
| | * | | | | fix on_deleteRydkin Maxim2017-04-041-1/+1
| | * | | | | add auto_canceled_by_id to safe_model_attributes.ymlRydkin Maxim2017-04-041-0/+1
| | * | | | | rename `auto_canceled_by` and add foreign keyRydkin Maxim2017-04-045-19/+28
| | * | | | | more brief way of get parent commitRydkin Maxim2017-04-041-1/+1
| | * | | | | change order of enum options in auto_cancel_pending_pipelinesRydkin Maxim2017-04-041-1/+1
| | * | | | | fix typoRydkin Maxim2017-04-041-1/+1
| | * | | | | move `auto_cancelable_pipelines` method to `create_pipeline_service.rb`Rydkin Maxim2017-04-042-10/+9
| | * | | | | add `does not cancel HEAD pipeline` specRydkin Maxim2017-04-041-1/+7
| | * | | | | add auto-cancel for pending pipelines on branch, if they are not HEADRydkin Maxim2017-04-0412-105/+232