Merge branch 'master' into adequaterecord

* master: (108 commits)
  make tests pass on Ruby 2.2
  Use Sqlite3 adapter in examples
  use the body proxy to freeze headers
  just ask the response for the commit status, we do not need to ask the jar
  only write the jar if the response isn't committed
  Fix a grammatical error in the i18n guide [ci skip]
  use method_defined? to check whether or not a method is defined
  Enhance docs for update_attribute [ci-skip]
  Change usec to 0 on tests that compare seconds
  Unit test for mysql quote time usec
  Changelog entry for mysql56 microseconds
  Test microsecond on mysql 5.6
  MySQL 5.6 and later supports microsecond precision in datetime.
  [ci skip] Add documentation for original_fullpath.
  Remove mocking on save, when not necessary
  comment why we are modifying global state. [ci skip]
  `change_table` supports `citext`. Follow up to #12523.
  Removed unnecessary command "application"
  register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]
  Fixes STI when 2+ levels deep.
  ...

3 files changed, 8 insertions, 8 deletions

diff --git a/actionpack/lib/action_dispatch/journey/nfa/dot.rb b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
index 5c33a872e5..47bf76bdbf 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/dot.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
@@ -16,9 +16,9 @@ module ActionDispatch
           #  end
           #  "  #{n.object_id} [label=\"#{label}\", shape=box];"
           #}
-          #memo_edges = memos.map { |k, memos|
+          #memo_edges = memos.flat_map { |k, memos|
           #  (memos || []).map { |v| "  #{k} -> #{v.object_id};" }
-          #}.flatten.uniq
+          #}.uniq
 
         <<-eodot
 digraph nfa {
diff --git a/actionpack/lib/action_dispatch/journey/nfa/simulator.rb b/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
index 5b40da6569..b23270db3c 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/simulator.rb
@@ -34,7 +34,7 @@ module ActionDispatch
 
           return if acceptance_states.empty?
 
-          memos = acceptance_states.map { |x| tt.memo(x) }.flatten.compact
+          memos = acceptance_states.flat_map { |x| tt.memo(x) }.compact
 
           MatchData.new(memos)
         end
diff --git a/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb b/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
index a3017aeea1..66e414213a 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/transition_table.rb
@@ -42,7 +42,7 @@ module ActionDispatch
         end
 
         def states
-          (@table.keys + @table.values.map(&:keys).flatten).uniq
+          (@table.keys + @table.values.flat_map(&:keys)).uniq
         end
 
         # Returns a generalized transition graph with reduced states. The states
@@ -93,7 +93,7 @@ module ActionDispatch
         # Returns set of NFA states to which there is a transition on ast symbol
         # +a+ from some state +s+ in +t+.
         def following_states(t, a)
-          Array(t).map { |s| inverted[s][a] }.flatten.uniq
+          Array(t).flat_map { |s| inverted[s][a] }.uniq
         end
 
         # Returns set of NFA states to which there is a transition on ast symbol
@@ -107,7 +107,7 @@ module ActionDispatch
         end
 
         def alphabet
-          inverted.values.map(&:keys).flatten.compact.uniq.sort_by { |x| x.to_s }
+          inverted.values.flat_map(&:keys).compact.uniq.sort_by { |x| x.to_s }
         end
 
         # Returns a set of NFA states reachable from some NFA state +s+ in set
@@ -131,9 +131,9 @@ module ActionDispatch
         end
 
         def transitions
-          @table.map { |to, hash|
+          @table.flat_map { |to, hash|
             hash.map { |from, sym| [from, sym, to] }
-          }.flatten(1)
+          }
         end
 
         private