aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactor a bitJon Leighton2012-08-011-38/+37
* Add `Relation#load`Jon Leighton2012-08-013-2/+35
* Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-08-019-45/+118
* Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-0115-84/+339
* Merge pull request #7217 from freerobby/no_password_requirement_if_validation...Carlos Antonio da Silva2012-08-013-2/+21
|\
| * has_secure_password should not raise a 'digest missing' error if the calling ...Robby Grossman2012-07-313-2/+21
* | Merge pull request #7228 from kennyj/move_to_ar2Carlos Antonio da Silva2012-08-011-1/+1
|\ \
| * | Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e9...kennyj2012-08-021-1/+1
|/ /
* | Merge pull request #7224 from kennyj/move_to_arJosé Valim2012-08-012-17/+22
|\ \
| * | The use_schema_cache_dump configuration moved to ActiveRecord.kennyj2012-08-022-17/+22
* | | Merge branch 'refactor-dependency-check'Carlos Antonio da Silva2012-08-014-21/+23
|\ \ \
| * | | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
| * | | move method for dependent option checkHrvoje Šimić2012-08-014-11/+22
| | |/ | |/|
* | | Merge pull request #7219 from jmazzi/masterRafael Mendonça França2012-08-011-0/+11
|\ \ \ | | |/ | |/|
| * | Restoring documentation for env_config per #7070Justin Mazzi2012-08-011-0/+11
|/ /
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
|\ \
| * | Updated scaffold_controller generator docs #7146Aaron Cruz2012-07-311-4/+3
|/ /
* | Merge pull request #7204 from frodsan/update_conventionsRafael Mendonça França2012-07-311-8/+8
|\ \
| * | update coding conventions in metal/liveFrancesco Rodriguez2012-07-301-8/+8
* | | html_escape should escape single quotesSantiago Pastorino2012-07-3110-30/+30
| |/ |/|
* | Merge pull request #7212 from accessd/small-typo-fixRafael Mendonça França2012-07-311-1/+1
|\ \
| * | fix typo in collection proxyAccessd2012-07-311-1/+1
|/ /
* | Update activesupport/CHANGELOG.mdJosé Valim2012-07-311-0/+2
* | Merge pull request #7197 from davidcelis/i18n_inflectorJosé Valim2012-07-316-25/+84
|\ \
| * | Make ActiveSupport::Inflector locale aware and multilingualDavid Celis2012-07-306-25/+84
* | | Merge pull request #7176 from bogdan/reverse_orderRafael Mendonça França2012-07-319-17/+35
|\ \ \
| * | | AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-319-17/+35
|/ / /
* | | Merge pull request #7205 from frodsan/fix_nodoc_liveCarlos Antonio da Silva2012-07-301-4/+4
|\ \ \ | |_|/ |/| |
| * | fix nodoc in metal/liveFrancesco Rodriguez2012-07-301-4/+4
|/ /
* | Merge pull request #7203 from frodsan/typo_liveRafael Mendonça França2012-07-301-6/+6
|\ \
| * | fix typo in metal/live [ci skip]Francesco Rodriguez2012-07-301-6/+6
|/ /
* | Remove the deprecation of update_column.Rafael Mendonça França2012-07-303-48/+18
* | Revert "DRY class_attribute code"José Valim2012-07-301-3/+6
* | Merge pull request #7198 from cfcosta/refactor-cache_control_headersRafael Mendonça França2012-07-291-11/+19
|\ \
| * | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers.Cainã Costa2012-07-301-11/+19
* | | updated changelogAaron Patterson2012-07-291-0/+16
* | | close the response when the response body is set so that normal render calls ...Aaron Patterson2012-07-292-0/+14
* | | header hash is duped before being sent up the rack stackAaron Patterson2012-07-293-12/+33
* | | freeze the header objectAaron Patterson2012-07-292-0/+7
* | | make sure set_response! sets the correct response objectAaron Patterson2012-07-292-0/+15
* | | adding a more docs on closing response streamsAaron Patterson2012-07-291-1/+4
* | | pushing Buffer up to LiveAaron Patterson2012-07-291-22/+22
* | | adding some docsAaron Patterson2012-07-291-1/+26
* | | Controller actions are processed in a separate thread for liveAaron Patterson2012-07-293-7/+105
* | | raise exceptions on header set after response committedAaron Patterson2012-07-293-0/+43
* | | make sure appropriate headers are set and deletedAaron Patterson2012-07-291-0/+11
* | | added live responses which can be written and read in separate threadsAaron Patterson2012-07-295-0/+130
| |/ |/|
* | ActionController::DataStreaming::FileBody doesn't respond to #close.Rafael Mendonça França2012-07-291-1/+1
* | flushing output should write to the stream rather than mutating the response ...Aaron Patterson2012-07-293-12/+16
|/
* remove dead testAaron Patterson2012-07-291-4/+0