aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370. Conflicts: activerecord/CHANGELOG.md It will be deprecated only in 4.0, and removed properly in 4.1.
* | | | Merge pull request #7217 from ↵Carlos Antonio da Silva2012-08-013-2/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | freerobby/no_password_requirement_if_validations_skipped has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
| * | | | has_secure_password should not raise a 'digest missing' error if the calling ↵Robby Grossman2012-07-313-2/+21
| | | | | | | | | | | | | | | | | | | | class has specified for validations to be skipped.
* | | | | 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 e35c67ae0f920011a2440210041e96659a8de985 [ci skip]
| * | | | | Change AR's CHANGELOG, because it is related to ↵kennyj2012-08-021-1/+1
|/ / / / / | | | | | | | | | | | | | | | e35c67ae0f920011a2440210041e96659a8de985
* | | | | Merge pull request #7224 from kennyj/move_to_arJosé Valim2012-08-012-17/+22
|\ \ \ \ \ | | | | | | | | | | | | The use_schema_cache_dump configuration moved to ActiveRecord.
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract dependency check logic that raises ArgumentError in case of an invalid :dependent option given to an association. Closes #7054
| * | | | | | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic for validation check to the same method, and cache dependent option in a variable to reuse inside the dependency configuration methods instead of relying on the options hash.
| * | | | | | 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
| * | | | | 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 #7146
| * | | | | Updated scaffold_controller generator docs #7146Aaron Cruz2012-07-311-4/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was just a copy of the controller generator documentation which was misleading. It doesn't accept arguments for views. This seems more descriptive as well. Respect 80 char limit. #7147 Made a nicer paragraph #7147
* | | | | Merge pull request #7204 from frodsan/update_conventionsRafael Mendonça França2012-07-311-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Follow code conventions in metal/live
| * | | | | update coding conventions in metal/liveFrancesco Rodriguez2012-07-301-8/+8
| | | | | |
* | | | | | html_escape should escape single quotesSantiago Pastorino2012-07-3110-30/+30
| |/ / / / |/| | | | | | | | | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215
* | | | | Merge pull request #7212 from accessd/small-typo-fixRafael Mendonça França2012-07-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | small fix typo in collection proxy
| * | | | | 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 multilingual
| * | | | | Make ActiveSupport::Inflector locale aware and multilingualDavid Celis2012-07-306-25/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Inflector is currently not very supportive of internationalized websites. If a user wants to singularize and/or pluralize words based on any locale other than English, they must define each case in locale files. Rather than create large locale files with mappings between singular and plural words, why not allow the Inflector to accept a locale? This patch makes ActiveSupport::Inflector locale aware and uses `:en`` unless otherwise specified. Users will still be provided a list of English (:en) inflections, but they may additionally define inflection rules for other locales. Each list is kept separately and permanently. There is no reason to limit users to one list of inflections: ActiveSupport::Inflector.inflections(:es) do |inflect| inflect.plural(/$/, 's') inflect.plural(/([^aeéiou])$/i, '\1es') inflect.plural(/([aeiou]s)$/i, '\1') inflect.plural(/z$/i, 'ces') inflect.plural(/á([sn])$/i, 'a\1es') inflect.plural(/é([sn])$/i, 'e\1es') inflect.plural(/í([sn])$/i, 'i\1es') inflect.plural(/ó([sn])$/i, 'o\1es') inflect.plural(/ú([sn])$/i, 'u\1es') inflect.singular(/s$/, '') inflect.singular(/es$/, '') inflect.irregular('el', 'los') end 'ley'.pluralize(:es) # => "leyes" 'ley'.pluralize(:en) # => "leys" 'avión'.pluralize(:es) # => "aviones" 'avión'.pluralize(:en) # => "avións" A multilingual Inflector should be of use to anybody that is tasked with internationalizing their Rails application. Signed-off-by: David Celis <david@davidcelis.com>
* | | | | | Merge pull request #7176 from bogdan/reverse_orderRafael Mendonça França2012-07-319-17/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | AR::Relation#order: make new order prepend old one.
| * | | | | | AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-319-17/+35
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User.order("name asc").order("created_at desc") # SELECT * FROM users ORDER BY created_at desc, name asc This also affects order defined in `default_scope` or any kind of associations.
* | | | | | Merge pull request #7205 from frodsan/fix_nodoc_liveCarlos Antonio da Silva2012-07-301-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix nodoc in metal/live [ci skip]
| * | | | | 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]
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | update_column was suggested as replacement of update_attribute at the last release of 3-2-stable, so deprecating it now will confuse the users.
* | | | Revert "DRY class_attribute code"José Valim2012-07-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | class_attribute is a building block and using define_method can be much slower for such basic method definitions. This reverts commit d59208d7032e2be855a89ad8d4685cc08dd7cdb3.
* | | | 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
| * | | | 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
| | | | | | | | | | | | | | | | | | | | will work
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responses. Processing controller actions in a separate thread allows us to work around the rack api - we can allow the user to set status and headers, then block until the first bytes are written. As soon as the first bytes are written, the main thread can return the status, headers, and (essentially) a queue for the body.
* | | | | 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
|/ / / | | | | | | | | | object
* | | remove dead testAaron Patterson2012-07-291-4/+0
| | |
* | | adding a buffered stream to the response objectAaron Patterson2012-07-294-3/+93
| | |
* | | initialize ivars, refactor recycle! to call initializeAaron Patterson2012-07-292-9/+3
| | |