aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16441 from ↵Santiago Pastorino2014-08-091-4/+4
|\ | | | | | | | | tomkadwill/activerecord_associations_options_param [ci skip] Changed options to +options+ for rdoc
| * [ci skip] Changed options to +options+ for rdocTom Kadwill2014-08-091-4/+4
| |
* | Merge pull request #16440 from tgxworld/pass_log_in_blockSantiago Pastorino2014-08-091-4/+6
|\ \ | | | | | | Pass block for logging.
| * | Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
| | | | | | | | | | | | This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
* | | Merge pull request #16439 from voxxit/patch-1Santiago Pastorino2014-08-091-1/+1
|\ \ \ | | | | | | | | Using delegated connection method
| * | | Using delegated connection methodJoshua Delsman2014-08-081-1/+1
| | |/ | |/|
* | | Merge pull request #16443 from duccioarmenise/patch-1Vijay Dev2014-08-091-1/+1
|\ \ \ | |/ / |/| | Rails Tutorial link updated
| * | Update README.mdDuccio Armenise2014-08-091-1/+1
|/ / | | | | Ruby on Rails Tutorial link updated.
* | Merge pull request #16437 from mscoutermarsh/masterRichard Schneeman2014-08-081-1/+1
|\ \ | | | | | | Docs: grammar fix for fetch. [ci skip]
| * | Docs: grammar fix for fetch. [ci skip]Mike Coutermarsh2014-08-081-1/+1
|/ /
* | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-085-38/+3
| | | | | | | | | | | | | | This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!!
* | Merge pull request #16434 from strzalek/cookies-digest-config-optionSantiago Pastorino2014-08-085-3/+38
|\ \ | | | | | | Add digest config option for SignedCookiesJar
| * | Return preconfigured AS::MessageVerifierŁukasz Strzałkowski2014-08-082-1/+7
| | |
| * | Add config option for cookies digestŁukasz Strzałkowski2014-08-084-2/+31
| | | | | | | | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = \SHA256'
* | | save a hash allocation per request.Aaron Patterson2014-08-081-1/+1
| | |
* | | add a test for prepending SCRIPT_NAME to generated urlsAaron Patterson2014-08-081-0/+88
| | |
* | | Merge pull request #16429 from arunagw/aa-build-fix-gemfile-springSantiago Pastorino2014-08-083-8/+13
|\ \ \ | |/ / |/| | Fixes test for Gemfile entry changes
| * | Fixes test for Gemfile entry changesArun Agrawal2014-08-083-8/+13
| |/ | | | | | | Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c
* | Merge pull request #16427 from ryandao/full_stack_source_extractGuillermo Iguaran2014-08-089-69/+114
|\ \ | | | | | | Full stack source extract
| * | Update actionpack CHANGELOGRyan Dao2014-08-081-0/+5
| | |
| * | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
| |/ | | | | | | | | | | Provide the ability to extract the source code of the entire exception stack trace, not just the frame raising the error. This improves debugging capability of the error page, especially for framework-related errors.
* | Merge pull request #16426 from tgxworld/fix_false_positiveSantiago Pastorino2014-08-081-4/+5
|\ \ | | | | | | Fixes to TestCaseTest.
| * | Fixes to TestCaseTest.Guo Xiang Tan2014-08-081-4/+5
| |/
* | Fix the #const_regexp's documentation [ci skip]Robin Dupret2014-08-081-3/+4
| | | | | | | | | | | | Originally introduced in f9086d63, the documentation of this method is wrong as #const_regexp returns a string to easy the interpolation inside regular expressions.
* | Merge pull request #16430 from guillermo/patch-1Rafael Mendonça França2014-08-081-1/+1
|\ \ | | | | | | Fix typo in plugins doc
| * | Fix typo in plugins docGuillermo Álvarez Fernández2014-08-081-1/+1
|/ /
* | Merge pull request #16428 from tomkadwill/activerecord_associations_name_paramCarlos Antonio da Silva2014-08-081-4/+4
|\ \ | |/ |/| [ci skip] Changed 'first argument' to '+name+ argument'
| * [ci skip] Changed 'first argument' to '+name+ argument'Tom Kadwill2014-08-081-4/+4
|/
* Rephrase how we explain RecordInvalid exception in the context ofZachary Scott2014-08-071-3/+5
| | | | | | `#create!` regarding validations in contrast to the behavior of `#create`. Also describe creating multiple objects using an array of hashes as the +attributes+ parameter. [ci skip] /cc #16384
* Merge pull request #16384 from tomkadwill/improved_create_documentationZachary Scott2014-08-071-2/+5
|\ | | | | [ci skip] Added +object+ and +attributes+ to create! description for rdoc
| * [ci skip] Updated create! documentation description and added +attributes+ ↵Tom Kadwill2014-08-071-2/+5
| | | | | | | | for rdoc
* | Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵David Heinemeier Hansson2014-08-072-10/+12
| | | | | | | | so it can be grouped with the other development tools
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-0737-207/+400
|\ \
| * | need to call superAaron Patterson2014-08-071-0/+1
| | |
| * | add a new constructor that runs load hooksAaron Patterson2014-08-072-5/+9
| | |
| * | defer running after_config hooks until after the object is allocatedAaron Patterson2014-08-071-7/+22
| | |
| * | Merge pull request #16424 from gregors/remove_dead_codeRafael Mendonça França2014-08-071-36/+0
| |\ \ | | | | | | | | remove dead file_watcher code
| | * | remove dead file_watcher codeGregory Ostermayr2014-08-071-36/+0
| | | |
| * | | use the uri parser so that newer version of Ruby workAaron Patterson2014-08-071-1/+1
| |/ /
| * | Merge pull request #16421 from tsukasaoishi/prevant_manycall_showtablesAaron Patterson2014-08-071-0/+7
| |\ \ | | | | | | | | Tables existence check query is executed in large quantities
| | * | change to empty? from blank?tsukasaoishi2014-08-081-1/+1
| | | |
| | * | Tables existence check query is executed in large quantitiestsukasaoishi2014-08-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Rails starts, tables existence check query is executed number of models. In case of mysql, SHOW TABLES LIKE 'table1'; SHOW TABLES LIKE 'table2'; SHOW TABLES LIKE 'table3'; ... SHOW TABLES LIKE 'table999'; Add process to get the names of all tables by one query.
| * | | Merge pull request #16422 from tgxworld/fix_spellingYves Senn2014-08-071-1/+1
| |\ \ \ | | |/ / | |/| | | | | | Closes #16422
| | * | Fix spelling.Guo Xiang Tan2014-08-071-1/+1
| |/ /
| * | Fix typo [ci skip]Carlos Antonio da Silva2014-08-071-1/+1
| | |
| * | Merge pull request #16412 from yevhene/masterSantiago Pastorino2014-08-073-2/+18
| |\ \ | | | | | | | | Fix in has_secure_password for passwords containing only spaces.
| | * | Allow password to contain spaces only.Yevhene Shemet2014-08-063-2/+18
| | | |
| * | | Merge pull request #16419 from tgxworld/remove_legacy_codeSantiago Pastorino2014-08-071-34/+0
| |\ \ \ | | | | | | | | | | Remove ActionController::RaiseActionExceptions.
| | * | | Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-34/+0
| |/ / / | | | | | | | | | | | | | | | | The latest modification to the code was done in https://github.com/rails/rails/commit/5e3517ea. In Rails 3.2, `ActionController#rescue_action` was deprecated and `rescue_action_without_handler` is no longer being used.
| * | | Define id_was to get the previous value of the primary keyRafael Mendonça França2014-08-063-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when we call id_was and we have a custom primary key name Active Record will return the current value of the primary key. This make impossible to correctly do an update operation if you change the id. Fixes #16413