Merge branch 'master' into fix-windows-build

cucumber · Jan 26, 2021 · 679aa56 · 679aa56
2 parents 1158ebc + 1e0b3b5
commit 679aa56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,14 +16,6 @@ commands:
           name: "Add ansicon"
           command: |
             choco install ansicon
-      - run:
-          name: "Add MSYS2"
-          command: |
-            choco install msys2
-      - run:
-          name: "Set-up Ruby devkit"
-          command: |
-            ridk install 2 3
 
   build:
     description: "Build and run the tests"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,10 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
   ([#1503](https://github.com/cucumber/cucumber-ruby/pull/1503)
    [aurelien-reeves](https://github.com/aurelien-reeves))
 
+* `--publish` and no formatter now uses the pretty formatter per default
+  ([#1468](https://github.com/cucumber/cucumber-ruby/issues/1468)
+   [#1500](https://github.com/cucumber/cucumber-ruby/pull/1500)
+   [aurelien-reeves](https://github.com/aurelien-reeves))
 
 ## [5.2.0](https://github.com/cucumber/cucumber-ruby/compare/v5.1.3...v5.2.0)