Skip to content

Commit 693d053

Browse files
committed
Prefer 'missing config' error message to 'github pages branch'
Fixes travis-ci/travis-ci#5933 If `.travis.yml` contains a YAML syntax error on the `gh-pages` branch, we display the error message "github pages branch" even if `gh-pages` is (textually) whitelisted in that file. We should display "missing config" instead.
1 parent 6d8cc93 commit 693d053

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/travis/model/request/approval.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ def message
6868
'skipped through commit message'
6969
elsif disabled_in_settings?
7070
request.pull_request? ? 'pull requests disabled' : 'pushes disabled'
71-
elsif github_pages?
72-
'github pages branch'
7371
elsif request.config.blank?
7472
'missing config'
73+
elsif github_pages?
74+
'github pages branch'
7575
elsif !branch_approved? || !branch_accepted?
7676
'branch not included or excluded'
7777
elsif !config_accepted?

0 commit comments

Comments
 (0)