aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated CHANGELOG, docs, guides and release notes.Godfrey Chan2014-02-115-26/+44
* Added changelog entry for Flash changes [ci skip]Godfrey Chan2014-02-111-0/+4
* Missed FlashHash#replaceGodfrey Chan2014-02-111-1/+1
* Fixed broken flash testsGodfrey Chan2014-02-112-5/+5
* Fix AppGeneratorTest: serializer option was removed from session_storeGuillermo Iguaran2014-02-111-1/+1
* Remove serializer option from session_store.rb templateGuillermo Iguaran2014-02-111-1/+1
* Re-write legacy (marshal) cookies on readGodfrey Chan2014-02-112-35/+57
* Stringify the incoming hash in FlashHashGuillermo Iguaran2014-02-111-1/+3
* Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-112-4/+25
* Changed the tests to ensure HybridSerializer actually migrates the cookies (c...Godfrey Chan2014-02-111-10/+18
* Fixed minor typo in test codeGodfrey Chan2014-02-111-1/+1
* Tests for the HybridSerializerRafael Mendonça França2014-02-111-0/+68
* Removed an old testGodfrey Chan2014-02-111-5/+0
* Added HybridSerializer to upgrade existing marshal cookies (wip: need tests)Godfrey Chan2014-02-111-0/+14
* Just very so slightly better test coverageGodfrey Chan2014-02-111-15/+57
* Renamed session_serializer option to cookies_serializerGodfrey Chan2014-02-117-67/+64
* Merge pull request #14008 from udaykadaboina/jqueryUpgradeCarlos Antonio da Silva2014-02-111-1/+1
|\
| * Upgraded jquery-rails gem versionUday Kadaboina2014-02-031-1/+1
* | docs, hide inflector comment targeting only contributors. [ci skip]Yves Senn2014-02-111-1/+3
* | Merge pull request #14007 from kintamanimatt/missing_directory_slashesRafael Mendonça França2014-02-101-9/+9
|\ \
| * | Add missing directory slashes [ci skip]Matthew Nicholas Bradley2014-02-101-9/+9
* | | Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
* | | Merge pull request #13919 from jcoyne/fix_jruby_encodingRafael Mendonça França2014-02-102-3/+10
|\ \ \
| * | | Fix tidy_bytes for JRubyJustin Coyne2014-02-102-3/+10
| |/ /
* | | docs, link to HTTP and CGI header definitions. [ci skip]Yves Senn2014-02-102-3/+5
* | | docs, update broken link. [ci skip]Yves Senn2014-02-101-2/+2
|/ /
* | docs, mention that the current inflection rules are frozen. [ci skip]Yves Senn2014-02-101-0/+4
* | Merge pull request #13998 from gaurish/doc-rails-threadsafeRobin Dupret2014-02-091-1/+1
|\ \
| * | `Rails.threadsafe!` mode is deprecatedGaurish Sharma2014-02-101-1/+1
* | | Merge pull request #13997 from dmitry/test_coverage_improvementRafael Mendonça França2014-02-095-12/+46
|\ \ \
| * | | add test coverage for activemodel Dirty#reset_changesDmitry Polushkin2014-02-091-0/+19
| * | | add actionmailer test coverage for undefined delivery methodDmitry Polushkin2014-02-092-10/+21
| * | | add activerecord test coverage for `sanitize_sql_array`Dmitry Polushkin2014-02-091-0/+5
| * | | move alias method `sanitize_conditions` to a correct placeDmitry Polushkin2014-02-091-2/+1
* | | | Set the :shallow_path as each scope is generatedAndrew White2014-02-093-1/+95
| |/ / |/| |
* | | Simplify doc [ci skip]Vijay Dev2014-02-091-1/+1
* | | Merge pull request #13630 from seapy/masterVijay Dev2014-02-091-2/+2
|\ \ \
| * | | Fixed typo [ci skip]seapy2014-01-081-2/+2
* | | | Merge pull request #13994 from elysdir/masterVijay Dev2014-02-091-3/+3
|\ \ \ \
| * | | | Clarifying confusing phrasingJed Hartman2014-02-091-3/+3
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-099-12/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed a grammatical error in Booleans section of API documentation guideZachary Scott2014-02-091-1/+1
| * | | | adds a section about booleans in the API guidelines [ci skip]Xavier Noria2014-02-091-0/+47
| * | | | Use full-length version of multiple from c7abc51Zachary Scott2014-02-091-1/+1
| * | | | docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-091-1/+3
| * | | | Specify what #starts_with? we're talking about. Also added a note whatZachary Scott2014-02-091-1/+2
| * | | | Fix grammar of internal comment and modify it's locationZachary Scott2014-02-091-1/+2
| * | | | Fixed spelling error: `extracetd` => `extracted`Calvin Tam2014-02-071-1/+1
| * | | | Remove old comments about suppressing warnings.Vipul A M2014-01-251-1/+1
| * | | | `framwork` => `framework`Vipul A M2014-01-241-1/+1