diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 25478aace..9e52c97e3 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. # This file contains defaults for RSpec projects. Individual projects diff --git a/.travis.yml b/.travis.yml index d19d8f591..636f13402 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. language: ruby @@ -39,3 +39,7 @@ matrix: - rvm: ruby-head - rvm: rbx fast_finish: true +branches: + only: + - master + - /^\d+-\d+-maintenance$/ diff --git a/appveyor.yml b/appveyor.yml index 7849f06d3..15461acc3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. version: "{build}" diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos index f2656ffb2..c7fae3a8a 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. set -e diff --git a/script/functions.sh b/script/functions.sh index f73757bab..1faf04ad5 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -113,7 +113,7 @@ function check_documentation_coverage { } function check_style_and_lint { - echo "bin/rubucop lib" + echo "bin/rubocop lib" bin/rubocop lib } diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh index b41ef5e2d..1c9275fbf 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. function is_mri { diff --git a/script/run_build b/script/run_build index 83f9be429..e78cbd843 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. set -e diff --git a/script/travis_functions.sh b/script/travis_functions.sh index 5f29f7cf6..8e86947b7 100644 --- a/script/travis_functions.sh +++ b/script/travis_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2015-02-08T20:55:32-08:00 from the rspec-dev repo. +# This file was generated on 2015-02-24T14:46:39-08:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. # Taken from: