speedup migrations by adding indices sooner
Merge pull request #1110 from opf/fix/speedup_legacy_journal_migrations
Failing spec for test mail user name display format
Fix for user name display format
Small refactoring of spec including comment to clarify before block
Merge pull request #1118 from opf/fix/user_mailer_mail_to
fix travis build status image src of release/3.0 branch
refactor session store initializer
set the path attribute of the session cookie when a relative url root is set
config can contain an empty string. use presence to convert that to nil. pass it directly to :path. rails handles the nil case with its default like before.
Merge pull request #1120 from marutosi/finn-rel-3.0-readme-src

fix travis build status image src of release/3.0 branch
Gemfile.lock: Update nokogiri to fix security issues

See:
* https://groups.google.com/forum/#!topic/ruby-security-ann/DeJpjTAg1FA
* https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc#1511--2013-12-14
Gemfile.lock: Update i18n to fix security issue

See
* https://groups.google.com/forum/#!topic/ruby-security-ann/pLrh6DUw998
* https://github.com/svenfuchs/i18n/commits/61f975bd862e2ce3a9f77fb5afdf11831fbcbb22
Merge pull request #1172 from opf/fix/i18n_and_nokogiri_vulnerabilities

Fix i18n and nokogiri vulnerabilities
Merge pull request #1175 from marutosi/finn-ie11

fix non-ascii attachment file name get corrupted in IE11 (#16711)
Merge branch 'release/3.0' into stable
Merge pull request #1178 from marutosi/finn-stable-pr

Merge branch 'release/3.0' into stable