Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-fix-issue-54189-11-4' into 'security-11-4' | Steve Azzopardi | 2018-11-18 | 1 | -0/+2 |
* | Merge branch 'fix_pat_auth-11-4' into 'security-11-4' | Robert Speicher | 2018-10-26 | 1 | -3/+1 |
* | Merge branch 'sh-block-other-localhost' into 'master' | Thiago Presa | 2018-10-24 | 1 | -0/+7 |
* | Merge branch 'security-redact-links-11-4' into 'security-11-4' | Jan Provaznik | 2018-10-24 | 1 | -0/+62 |
* | Merge branch 'sh-validate-wiki-attachments-11-4' into 'security-11-4' | Thiago Presa | 2018-10-24 | 2 | -2/+17 |
* | Merge branch 'security-11-4-junit-test-report-exposes-stacktrace' into 'secur... | Jan Provaznik | 2018-10-24 | 1 | -4/+4 |
* | Merge branch 'security-if-51113-hash_tokens-11-4' into 'security-11-4' | Jan Provaznik | 2018-10-24 | 4 | -12/+61 |
* | Merge branch 'patch-29' into 'master' | Kamil Trzciński | 2018-10-08 | 1 | -3/+6 |
|\ | |||||
| * | Updates Laravel.gitlab-ci.yml template | Paul Giberson | 2018-10-06 | 1 | -3/+6 |
* | | Merge branch 'backport-ce-to-ee-merge' into 'master' | Stan Hu | 2018-10-06 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix CE to EE merge (backport) | Kamil Trzciński | 2018-10-05 | 1 | -1/+1 |
* | | Add timed incremental rollout to Auto DevOps | Alessio Caiazza | 2018-10-05 | 1 | -31/+57 |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Bob Van Landuyt | 2018-10-05 | 4 | -5/+18 |
|\ \ | |||||
| * \ | Merge branch 'security-bw-confidential-titles-through-markdown-api' into 'mas... | Bob Van Landuyt | 2018-10-05 | 2 | -4/+10 |
| |\ \ | |||||
| | * | | post_process markdown redered by API | Brett Walker | 2018-09-29 | 2 | -4/+10 |
| * | | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master' | Bob Van Landuyt | 2018-10-05 | 2 | -1/+8 |
| |\ \ \ | |||||
| | * | | | Filter system notes with public and private cross references | Brett Walker | 2018-10-02 | 2 | -1/+8 |
* | | | | | Merge branch '50359-activerecord-statementinvalid-pg-querycanceled-error-canc... | Sean McGivern | 2018-10-05 | 1 | -9/+75 |
|\ \ \ \ \ | |||||
| * | | | | | Use a CTE to remove the query timeout | Brett Walker | 2018-10-05 | 1 | -9/+75 |
* | | | | | | Merge branch 'ce-5987-project-templates-api' into 'master' | Robert Speicher | 2018-10-05 | 5 | -7/+74 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Backport project template API to CE | Nick Thomas | 2018-10-05 | 5 | -7/+74 |
* | | | | | | Merge branch 'scheduled-manual-jobs' into 'master' | Kamil Trzciński | 2018-10-05 | 12 | -7/+157 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-05 | 10 | -13/+102 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-05 | 7 | -7/+16 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add limitation for start_in keyword | Shinya Maeda | 2018-10-04 | 3 | -1/+16 |
| * | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-04 | 13 | -135/+108 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-03 | 4 | -1/+95 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Rename failure reason to stale_schedule | Shinya Maeda | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Add scheduled status | Shinya Maeda | 2018-10-02 | 3 | -1/+23 |
| * | | | | | | | | | | Add unschedule action to status build | Shinya Maeda | 2018-10-02 | 2 | -0/+42 |
| * | | | | | | | | | | Fix coding style offence | Shinya Maeda | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Use correct icon for scheduled jobs in pipeline graph | Winnie Hellmann | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Allow remaining time of scheduled jobs to overflow one day | Winnie Hellmann | 2018-10-02 | 1 | -2/+4 |
| * | | | | | | | | | | Fix URL to empty state graphic of scheduled jobs | Winnie Hellmann | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Fix Status::Build::Scheduled. Add spec for the class. | Shinya Maeda | 2018-10-02 | 1 | -1/+4 |
| * | | | | | | | | | | Fix validation methods in Config::Entry::Job. Added spec for that | Shinya Maeda | 2018-10-02 | 1 | -9/+4 |
| * | | | | | | | | | | Add schedule_expired to failed status | Shinya Maeda | 2018-10-02 | 1 | -1/+2 |
| * | | | | | | | | | | Remove Scheduled Status class from pipeline | Shinya Maeda | 2018-10-02 | 3 | -23/+1 |
| * | | | | | | | | | | Check the precense of scheduled_at in Status::Build | Shinya Maeda | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Fix stuck job worker. Fix sidekiq queue namespace | Shinya Maeda | 2018-10-02 | 1 | -1/+2 |
| * | | | | | | | | | | Introduce enqueue_scheduled event | Shinya Maeda | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Fix spec. Create scheduled status entry for pipeline | Shinya Maeda | 2018-10-02 | 2 | -0/+22 |
| * | | | | | | | | | | Fix rubocop offence | Shinya Maeda | 2018-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | Update pipelines and stages status as well | Shinya Maeda | 2018-10-02 | 2 | -23/+24 |
| * | | | | | | | | | | Add a new status to ci_builds.status | Shinya Maeda | 2018-10-02 | 3 | -6/+10 |
| * | | | | | | | | | | Rename delayed to scheduled | Shinya Maeda | 2018-10-02 | 3 | -12/+14 |
| * | | | | | | | | | | Support new syntax | Shinya Maeda | 2018-10-02 | 4 | -10/+10 |
| * | | | | | | | | | | Squashed commit of the following: | Shinya Maeda | 2018-10-02 | 4 | -3/+65 |
* | | | | | | | | | | | Merge branch 'add-installation-type-backup-information' into 'master' | Douwe Maan | 2018-10-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add installation type to backup information file | Balasankar "Balu" C | 2018-10-05 | 1 | -0/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | |