Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fix shadowing outer local variable warning | Sergey Nartimov | 2012-09-19 | 1 | -3/+3 | |
| | | ||||||
* | | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 12 | -48/+385 | |
|\ \ | | | | | | | Integrate strong_parameters in Rails 4 | |||||
| * | | AC::ParameterMissing inherits from KeyError since it's more appropiated than ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | IndexError | |||||
| * | | Support fields_for attributes, which may have numeric symbols as hash keys | Guillermo Iguaran | 2012-09-16 | 2 | -0/+22 | |
| | | | ||||||
| * | | Add config.action_controller.permit_all_attributes to bypass ↵ | Guillermo Iguaran | 2012-09-16 | 4 | -1/+21 | |
| | | | | | | | | | | | | StrongParameters protection | |||||
| * | | Change tainted/untainted wording to permitted/forbidden | Guillermo Iguaran | 2012-09-16 | 3 | -26/+26 | |
| | | | ||||||
| * | | Don't use assert_nothing_raised when assert_equal is used | Guillermo Iguaran | 2012-09-16 | 1 | -4/+2 | |
| | | | ||||||
| * | | require abstract_unit in parameters tests | Guillermo Iguaran | 2012-09-16 | 3 | -0/+3 | |
| | | | ||||||
| * | | Remove integration between attr_accessible/protected and ↵ | Guillermo Iguaran | 2012-09-16 | 3 | -48/+2 | |
| | | | | | | | | | | | | AC::Metal::ParamsWrapper | |||||
| * | | Integrate ActionController::Parameters from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 8 | -0/+340 | |
| | | | ||||||
* | | | copy edits 137e5d9 | Xavier Noria | 2012-09-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add extra documentation for password_field | Arek W | 2012-09-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | I think this should be explicit as the password fields behaviour is inconsistent with other fields in this regard. It had me scratching my head until I dug through the source code. | |||||
* | | | cleanup, remove whitespace from CHANGELOG | Yves Senn | 2012-09-17 | 1 | -6/+6 | |
| | | | ||||||
* | | | log 404 status when ActiveRecord::RecordNotFound was raised (#7646) | Yves Senn | 2012-09-17 | 4 | -2/+26 | |
| | | | ||||||
* | | | removes unnecessary self | Xavier Noria | 2012-09-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | revises the RDoc of AC::Base.without_modules | Xavier Noria | 2012-09-17 | 1 | -2/+2 | |
| | | | ||||||
* | | | documents the request and response methods in AC::Base | Xavier Noria | 2012-09-17 | 1 | -3/+21 | |
| | | | ||||||
* | | | revises RDoc in AC::Metal [ci skip] | Xavier Noria | 2012-09-17 | 1 | -14/+7 | |
| | | | ||||||
* | | | removes unnecessary self | Xavier Noria | 2012-09-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #7669 from guilleiguaran/rename-rb-handler | Carlos Antonio da Silva | 2012-09-17 | 4 | -5/+5 | |
|\ \ \ | | | | | | | | | Rename .rb template handler to .ruby to avoid conflicts with mustache classes | |||||
| * | | | Rename .rb template handler to .ruby to avoid conflicts with mustache views ↵ | Guillermo Iguaran | 2012-09-17 | 4 | -5/+5 | |
| |/ / | | | | | | | | | | classes | |||||
* | | | allowing pass couple extension to register_template_handler call | Tima Maslyuchenko | 2012-09-17 | 3 | -3/+17 | |
| | | | ||||||
* | | | Add missing entries in AP changelog | Guillermo Iguaran | 2012-09-16 | 1 | -0/+13 | |
|/ / | ||||||
* | | Check if etag exists before to do the gsub | Rafael Mendonça França | 2012-09-15 | 1 | -2/+4 | |
| | | | | | | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981 | |||||
* | | fix the build | Steve Klabnik | 2012-09-15 | 1 | -0/+1 | |
| | | ||||||
* | | Support for multiple etags in an If-None-Match header | Travis Warlick | 2012-09-15 | 3 | -1/+48 | |
| | | | | | | | | | | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb | |||||
* | | update CHANGELOG | Sergey Nartimov | 2012-09-14 | 1 | -0/+16 | |
| | | | | | | | | | | Add entry about 245941101b1ea00a9b1af613c20b0ee994a43946 and 95be790ece75710f2588558a6d5f40fd09543b97. | |||||
* | | Merge pull request #7634 from arunagw/build_fix_actionmailer | José Valim | 2012-09-14 | 1 | -0/+1 | |
|\ \ | | | | | | | Build fix for ActionMailer | |||||
| * | | Build fix for ActionMailer | Arun Agrawal | 2012-09-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | See http://travis-ci.org/#!/rails/rails/jobs/2444632 | |||||
* | | | use presence method instead of checking for blank | Nihad Abbasov | 2012-09-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #7616 from lest/null-session-forgery-protection | Michael Koziarski | 2012-09-13 | 2 | -32/+76 | |
|\ \ | | | | | | | Implement :null_session CSRF protection method | |||||
| * | | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 2 | -32/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946. The :null_session CSRF protection method provide an empty session during request processing but doesn't reset it completely (as :reset_session does). | |||||
* | | | Define a SynchronousQueue for test in Action Pack. | Rafael Mendonça França | 2012-09-12 | 2 | -6/+10 | |
| | | | | | | | | | | | | We don't need to rely on rails/queueing in Action Pack tests | |||||
* | | | Merge pull request #7612 from arunagw/build_fix_queue | Carlos Antonio da Silva | 2012-09-12 | 1 | -0/+6 | |
|\ \ \ | | | | | | | | | Fix build Rails.queue | |||||
| * | | | Fix build Rails.queue | Arun Agrawal | 2012-09-12 | 1 | -0/+6 | |
| |/ / | | | | | | | | | | see 34b23e7110a3a13cf157608cefc9b5701017bf39 | |||||
* / / | warning removed. | Arun Agrawal | 2012-09-12 | 1 | -1/+0 | |
|/ / | | | | | | | | | 1. Unused variable 2. possibly useless use of a variable in void context | |||||
* | | Merge pull request #7594 from guilleiguaran/rb-template-handler | Rafael Mendonça França | 2012-09-10 | 4 | -0/+14 | |
|\ \ | | | | | | | Add .rb template handler | |||||
| * | | Add .rb template handler | Guillermo Iguaran | 2012-09-11 | 4 | -0/+14 | |
| | | | | | | | | | | | | This handler simply allows arbitrary Ruby code as a template | |||||
* | | | Merge pull request #7513 from kalys/master | Carlos Antonio da Silva | 2012-09-09 | 6 | -10/+10 | |
|\ \ \ | | | | | | | | | ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers. | |||||
| * | | | ' dates back to SGML when ' was introduced in HTML 4.0 | Kalys Osmonov | 2012-09-09 | 6 | -10/+10 | |
| |/ / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-09 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |||||
| * | | | Doc: sweepers only work on Active Record Models | schneems | 2012-09-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | In response to this rails issue: https://github.com/rails/rails/issues/3729 | |||||
* | | | | Use internal instance variable naming scheme for mounted URL helper proxies | Sam Pohlenz | 2012-09-09 | 2 | -1/+12 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #7577 from frodsan/fix_ap_response | Rafael Mendonça França | 2012-09-08 | 1 | -25/+32 | |
|\ \ \ | | | | | | | | | set default_headers to nil after use it to avoid order dependent tests | |||||
| * | | | set default_headers to nil after use it to avoid order dependent tests | Francesco Rodriguez | 2012-09-08 | 1 | -25/+32 | |
| | | | | ||||||
* | | | | Fixed missing require | Ilya Vorontsov | 2012-09-08 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | | | | | | | | | | Missing require caused fail of guide generation (in action_dispatch/http/mime_type, line 295, undefined method `ends_with` for "to_ary":String) With this fix guides were normally generated | |||||
* | | | Tidy up excerpt separator logic a bit | Carlos Antonio da Silva | 2012-09-08 | 1 | -17/+11 | |
| | | | ||||||
* | | | Improve latest AR and AP changelog entries | Carlos Antonio da Silva | 2012-09-08 | 1 | -1/+6 | |
| | | | ||||||
* | | | Refactor some date helpers to use merge! | Carlos Antonio da Silva | 2012-09-08 | 1 | -5/+9 | |
| | | | | | | | | | | | | Also just set the hash value instead of merging when it's only one key. | |||||
* | | | Merge pull request #7189 from GCorbel/excerpt_with_separation | Carlos Antonio da Silva | 2012-09-08 | 3 | -11/+64 | |
|\ \ \ | | | | | | | | | Add a separator option for the excerpt function. |