summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reschedule project authorizations in a migrationreschedule-project-authorizationsYorick Peterse2017-04-072-0/+45
* Merge branch 'docs-search' into 'master' Sean Packham (GitLab)2017-04-0711-23/+117
|\
| * Doc: Search through GitLabMarcia Ramos2017-04-0711-23/+117
|/
* Merge branch '28574-jira-trigers' into 'master' Sean McGivern2017-04-073-2/+6
|\
| * Remove confusing placeholder for JIRA transition_idJarka Kadlecova2017-04-053-2/+6
* | Merge branch 'feature/service-desk-be-backport' into 'master' Sean McGivern2017-04-073-1/+8
|\ \
| * | Backport permissions and multi-line array to CEFelipe Artur2017-04-073-1/+8
* | | Merge branch '27724-fe-update-trace-handling-code' into 'master' Jacob Schatz2017-04-074-173/+238
|\ \ \
| * | | FE: Resolve "Performance issues when processing large build traces with Ansi2...Filipa Lacerda2017-04-074-173/+238
|/ / /
* | | Merge branch '24240-prometheus_healthz' into 'master' Douwe Maan2017-04-0717-20/+662
|\ \ \
| * | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-0717-20/+662
|/ / /
* | | 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