aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--activesupport/CHANGELOG.md4
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 2006291052..72b077be65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,17 +93,17 @@ matrix:
- rvm: 2.4.0
env:
- "GEM=ar:sqlite3_mem"
- - rvm: jruby-9.1.7.0
+ - rvm: jruby-9.1.8.0
jdk: oraclejdk8
env:
- "GEM=ap"
- - rvm: jruby-9.1.7.0
+ - rvm: jruby-9.1.8.0
jdk: oraclejdk8
env:
- "GEM=am,amo,aj"
allow_failures:
- rvm: ruby-head
- - rvm: jruby-9.1.7.0
+ - rvm: jruby-9.1.8.0
- env: "GEM=ac:integration"
fast_finish: true
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index fb7379d153..024202de9c 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,6 +1,6 @@
-* Update `titlelize` regex to allow apostrophes
+* Update `titleize` regex to allow apostrophes
- In 4b685aa the regex in `titlelize` was updated to not match apostrophes to
+ In 4b685aa the regex in `titleize` was updated to not match apostrophes to
better reflect the nature of the transformation. Unfortunately this had the
side effect of breaking capitalization on the first word of a sub-string, e.g: