Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docs | Rafael Mendonça França | 2012-07-31 | 1 | -4/+3 |
|\ | | | | | | | Updated scaffold_controller generator docs #7146 | ||||
| * | Updated scaffold_controller generator docs #7146 | Aaron Cruz | 2012-07-31 | 1 | -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_conventions | Rafael Mendonça França | 2012-07-31 | 1 | -8/+8 |
|\ | | | | | Follow code conventions in metal/live | ||||
| * | update coding conventions in metal/live | Francesco Rodriguez | 2012-07-30 | 1 | -8/+8 |
| | | |||||
* | | html_escape should escape single quotes | Santiago Pastorino | 2012-07-31 | 10 | -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-fix | Rafael Mendonça França | 2012-07-31 | 1 | -1/+1 |
|\ \ | | | | | | | small fix typo in collection proxy | ||||
| * | | fix typo in collection proxy | Accessd | 2012-07-31 | 1 | -1/+1 |
|/ / | |||||
* | | Update activesupport/CHANGELOG.md | José Valim | 2012-07-31 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #7197 from davidcelis/i18n_inflector | José Valim | 2012-07-31 | 6 | -25/+84 |
|\ \ | | | | | | | Make ActiveSupport::Inflector locale aware and multilingual | ||||
| * | | Make ActiveSupport::Inflector locale aware and multilingual | David Celis | 2012-07-30 | 6 | -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_order | Rafael Mendonça França | 2012-07-31 | 9 | -17/+35 |
|\ \ \ | | | | | | | | | AR::Relation#order: make new order prepend old one. | ||||
| * | | | AR::Relation#order: make new order prepend old one | Bogdan Gusiev | 2012-07-31 | 9 | -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_live | Carlos Antonio da Silva | 2012-07-30 | 1 | -4/+4 |
|\ \ \ | |_|/ |/| | | Fix nodoc in metal/live [ci skip] | ||||
| * | | fix nodoc in metal/live | Francesco Rodriguez | 2012-07-30 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #7203 from frodsan/typo_live | Rafael Mendonça França | 2012-07-30 | 1 | -6/+6 |
|\ \ | | | | | | | fix typo in metal/live [ci skip] | ||||
| * | | fix typo in metal/live [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -6/+6 |
|/ / | |||||
* | | Remove the deprecation of update_column. | Rafael Mendonça França | 2012-07-30 | 3 | -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é Valim | 2012-07-30 | 1 | -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_headers | Rafael Mendonça França | 2012-07-29 | 1 | -11/+19 |
|\ \ | | | | | | | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers | ||||
| * | | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers. | Cainã Costa | 2012-07-30 | 1 | -11/+19 |
| | | | |||||
* | | | updated changelog | Aaron Patterson | 2012-07-29 | 1 | -0/+16 |
| | | | |||||
* | | | close the response when the response body is set so that normal render calls ↵ | Aaron Patterson | 2012-07-29 | 2 | -0/+14 |
| | | | | | | | | | | | | will work | ||||
* | | | header hash is duped before being sent up the rack stack | Aaron Patterson | 2012-07-29 | 3 | -12/+33 |
| | | | |||||
* | | | freeze the header object | Aaron Patterson | 2012-07-29 | 2 | -0/+7 |
| | | | |||||
* | | | make sure set_response! sets the correct response object | Aaron Patterson | 2012-07-29 | 2 | -0/+15 |
| | | | |||||
* | | | adding a more docs on closing response streams | Aaron Patterson | 2012-07-29 | 1 | -1/+4 |
| | | | |||||
* | | | pushing Buffer up to Live | Aaron Patterson | 2012-07-29 | 1 | -22/+22 |
| | | | |||||
* | | | adding some docs | Aaron Patterson | 2012-07-29 | 1 | -1/+26 |
| | | | |||||
* | | | Controller actions are processed in a separate thread for live | Aaron Patterson | 2012-07-29 | 3 | -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 committed | Aaron Patterson | 2012-07-29 | 3 | -0/+43 |
| | | | |||||
* | | | make sure appropriate headers are set and deleted | Aaron Patterson | 2012-07-29 | 1 | -0/+11 |
| | | | |||||
* | | | added live responses which can be written and read in separate threads | Aaron Patterson | 2012-07-29 | 5 | -0/+130 |
| |/ |/| | |||||
* | | ActionController::DataStreaming::FileBody doesn't respond to #close. | Rafael Mendonça França | 2012-07-29 | 1 | -1/+1 |
| | | |||||
* | | flushing output should write to the stream rather than mutating the response ↵ | Aaron Patterson | 2012-07-29 | 3 | -12/+16 |
|/ | | | | object | ||||
* | remove dead test | Aaron Patterson | 2012-07-29 | 1 | -4/+0 |
| | |||||
* | adding a buffered stream to the response object | Aaron Patterson | 2012-07-29 | 4 | -3/+93 |
| | |||||
* | initialize ivars, refactor recycle! to call initialize | Aaron Patterson | 2012-07-29 | 2 | -9/+3 |
| | |||||
* | Remove warning renaming the test classes to use the test convention | Rafael Mendonça França | 2012-07-29 | 2 | -2/+2 |
| | |||||
* | Remove deprecation warning, since scoped waas deprecated | Rafael Mendonça França | 2012-07-29 | 1 | -1/+1 |
| | |||||
* | Merge pull request #7196 from ↵ | Aaron Patterson | 2012-07-29 | 1 | -1/+5 |
|\ | | | | | | | | | rimidl/fix-incorrect-require-mysql-in-mysql_rake_test Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test | ||||
| * | fix incorrect usage `require mysql` in the ↵ | Vladimir Strakhov | 2012-07-29 | 1 | -1/+5 |
| | | | | | | | | activerecord/test/.../mysql_rake_test.rb | ||||
* | | Merge pull request #7188 from rodrigoflores/master | Carlos Antonio da Silva | 2012-07-29 | 1 | -1/+2 |
|\ \ | | | | | | | Documentation Fix: Pointing the case when no dependent option is given to a association method | ||||
| * | | Explaining a bit better about the default behaviour of dependent | Rodrigo Flores | 2012-07-28 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #7192 from bogdan/sqlite_tests_fix | Carlos Antonio da Silva | 2012-07-29 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | More polite cleanup for sqlite tests | ||||
| * | | | More polite cleanup for sqlite tests | Bogdan Gusiev | 2012-07-29 | 1 | -4/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #7194 from alexandrz/master | Carlos Antonio da Silva | 2012-07-29 | 1 | -6/+3 |
|\ \ \ | |/ / |/| | | DRY class_attribute | ||||
| * | | DRY class_attribute code | Aleksandr Zykov | 2012-07-29 | 1 | -6/+3 |
|/ / | |||||
* | | issue a warning when we cannot construct a controller | Aaron Patterson | 2012-07-28 | 1 | -2/+10 |
| | | |||||
* | | this test is not a controller test, so switch to AS::TC | Aaron Patterson | 2012-07-28 | 1 | -1/+1 |
|/ | |||||
* | removes the AR session store from eager loaded code [fixes #7160] | Xavier Noria | 2012-07-29 | 1 | -1/+10 |
| | | | | | See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale. |