aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18910 from perceptec/add_suppressorRafael Mendonça França2015-02-198-0/+118
|\ | | | | | | Add `ActiveRecord::Base.suppress` to allow save events to be suppressed within a specified block.
| * Add `ActiveRecord::Base.suppress`Michael Ryan2015-02-188-0/+118
| |
* | Merge pull request #18994 from tgxworld/run_delete_middleware_operations_lastGuillermo Iguaran2015-02-193-2/+28
|\ \ | | | | | | Allow Rack::Runtime to be deleted from middleware stack.
| * | Allow Rack::Runtime to be deleted from middleware stack.Guo Xiang Tan2015-02-193-2/+28
| | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/16433.
* | | Merge pull request #18999 from simi/remove-unused-gsub_app_fileGuillermo Iguaran2015-02-181-6/+0
|\ \ \ | | | | | | | | Remove unused gsub_app_file method from Bukkit.
| * | | Remove unused gsub_app_file method from Bukkit.Josef Šimánek2015-02-191-6/+0
|/ / /
* | | Freeze strings to reduce allocations in integration testseileencodes2015-02-181-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves `X-Request-ID`, `action_dispatch.request_id` and `HTTP_X_REQUEST_ID` strings to constants and freezes them. We are freezing these strings to reduce the number of allocations in Rails integration tests. The tests are spending a lot of time in GC and this reduces the amount of time spent from 12% to 9% (in combination with Rack PR that also freezes some strings). Number of allocations before this change: 1030722 Number of allocations after this change: 967722
* | | Reduce the number of times `#clean_path_info` is calledeileencodes2015-02-181-3/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unnecessary to call `#clean_path_info`. It doesn't need to be called on the path with each extension. This reduces allocations to `Rack::Utils` in integration tests. Before `#clean_path_info` from `Rack::Utils` (line 622) was number 2 in top 5 allocations: ``` [["rack/lib/rack/utils.rb", 499, :T_STRING], [51034, 4539, 71559, 0, 12, 1791120]] [["rack/lib/rack/utils.rb", 662, :T_STRING], [33012, 0, 27930, 0, 1, 1226009]] [["rails/activesupport/lib/active_support/notifications/fanout.rb", 55, :T_DATA], [29998, 0, 25380, 0, 1, 3230600]] [["rails/activesupport/lib/active_support/subscriber.rb", 99, :T_STRING], [29996, 0, 25378, 0, 2, 1113840]] [["rails/activesupport/lib/active_support/notifications/instrumenter.rb", 52, :T_HASH], [29994, 147, 27014, 0, 11, 4897784]] ``` After `#clean_path_info` from `Rack::Utils` (line 622) does not appear in the top 5 highest allocations: ``` [["rack/lib/rack/utils.rb", 499, :T_STRING], [47617, 2414, 68969, 0, 12, 1667360]] [["rack/lib/rack/body_proxy.rb", 34, :T_ARRAY], [28230, 0, 26060, 0, 1, 1046800]] [["rails/activesupport/lib/active_support/notifications/fanout.rb", 55, :T_DATA], [28208, 0, 26042, 0, 1, 3034096]] [["rails/activesupport/lib/active_support/subscriber.rb", 99, :T_STRING], [28204, 0, 26040, 0, 1, 1046080]] [["rails/activesupport/lib/active_support/callbacks.rb", 165, :T_DATA], [28200, 0, 26046, 0, 2, 3451800]] ```
* | Merge pull request #18956 from hjoo/time_optionEileen M. Uchitelle2015-02-183-6/+34
|\ \ | | | | | | Add `time` option to `#touch
| * | Add `time` option to `#touch`Hyonjee Joo2015-02-183-6/+34
| |/ | | | | | | | | | | Fixes #18905. `#touch` now takes time as an option. Setting the option saves the record with the updated_at/on attributes set to the current time or the time specified. Updated tests and documentation accordingly.
* | Try only to decode stringsRafael Mendonça França2015-02-181-2/+4
| | | | | | | | | | This approach will avoid us to check for NoMethodError when trying to decode
* | Merge pull request #18917 from lautis/non-string-csrf-tokenRafael Mendonça França2015-02-183-1/+13
|\ \ | | | | | | | | | Handle non-string authenticity tokens
| * | Handle non-string authenticity tokensVille Lautanala2015-02-123-1/+13
| | | | | | | | | | | | Non-string authenticity tokens raised NoMethodError when decoding the masked token.
* | | Merge pull request #18411 from todd/extract_record_tag_helperRafael Mendonça França2015-02-185-263/+22
|\ \ \ | | | | | | | | Remove RecordTagHelper
| * | | Remove RecordTagHelper, add extraction noticesTodd Bealmear2015-02-165-263/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Per DHH in #18337, ActionView::Helpers::RecordTagHelper has been extracted to an external gem (source currently lives at todd/record_tag_helper). Removal notices have also been added for anyone upgrading that use the extracted methods.
* | | | Merge pull request #18393 from y-yagi/fix_mailerRafael Mendonça França2015-02-186-20/+38
|\ \ \ \ | | | | | | | | | | follow up to #18074
| * | | | follow up to #18074yuuji.yaginuma2015-01-086-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | * ignore mailer suffix when generate test files * add mailer suffix to view files
* | | | | Merge pull request #18634 from morgoth/deprecate-some-errors-methodsRafael Mendonça França2015-02-183-24/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Deprecate `ActiveModel::Errors` `get`, `set` and `[]=` methods.
| * | | | | Deprecate `ActiveModel::Errors` `get`, `set` and `[]=` methods.Wojciech Wnętrzak2015-02-013-24/+54
| | | | | | | | | | | | | | | | | | | | | | | | They have inconsistent behaviour currently.
* | | | | | Add nodoc to private constant [ci skip]Rafael Mendonça França2015-02-181-1/+1
| | | | | |
* | | | | | Merge pull request #18970 from nithinbekal/local-assigns-docRafael Mendonça França2015-02-181-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add documentation for local_assigns [ci skip]
| * | | | | | Add documentation for local_assigns [ci skip]Nithin Bekal2015-02-171-0/+8
| | | | | | |
* | | | | | | Improve documentation of local_assignsRafael Mendonça França2015-02-181-7/+13
| | | | | | |
* | | | | | | Merge pull request #15700 from maurogeorge/guides-local_assignsRafael Mendonça França2015-02-182-0/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs about local_assigns on guides
| * | | | | | | Add RDoc about local_assignsMauro George2014-06-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Add docs about local_assigns on guidesMauro George2014-06-131-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Talk about Gemfile.lock in the contributing guideRafael Mendonça França2015-02-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #18992 from rails/rm-track-lock-fileRafael Mendonça França2015-02-183-1/+282
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Track Gemfile.lock at the repository
| * | | | | | | | Track Gemfile.lock at the repositoryRafael Mendonça França2015-02-183-1/+282
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main reason is to make bisect easier. In some points, we have a lot of git dependencies. Since we don't have the information of which commit we are referring to, bundler get the latest commit of the master branch of the dependency. This sometimes returns a version that is not compatible with Rails anymore, making the tests fail and the harder to identify the commit that introduced a bug. Also this will make sure that a contributor will always get a set of dependencies that are passing with our tests. In our CI server we delete the lock file to make sure we are always testing against the newest release of our dependencies.
* / | | | | | | Revert "Merge pull request #18951 from ↵Rafael Mendonça França2015-02-181-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jurezove/gemfile-lock-to-plugin-gitignore-template" This reverts commit b824dfd44bf2dd932d6d955ac868af1020f0099a, reversing changes made to 265dcb779dd4bfd9745e0131f585749d7034c3c7. Our general recommendation is to check in the lock file in the repository. This make possible to developers and contributors of a plugin always run their tests against a working set of dependencies. Also, bisect is a lot easier, specially if you have git dependencies in your Gemfile.
* | | | | | | Merge pull request #18984 from rousisk/masterCarlos Antonio da Silva2015-02-182-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace deprecated readonly option with scope blocks in docs and guide
| * | | | | | | Replace deprecated readonly option with scope blocks in docs and guideKonstantinos Rousis2015-02-182-5/+4
| | | | | | | |
* | | | | | | | Merge pull request #18987 from ↵Carlos Antonio da Silva2015-02-1821-25/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/prefer_drop_table_if_exists_true_over_raw_sql Prefer `drop_table if_exists: true` over raw SQL
| * | | | | | | | Prefer `drop_table if_exists: true` over raw SQLRyuta Kamizono2015-02-1821-25/+25
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lowercase raw SQL has been replaced by 07b659c already. This commit replaces everything else of raw SQL.
* / / / / / / / constants guide: adds a step to a resolution algorithmXavier Noria2015-02-181-1/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure how this one slipped, maybe deleted by accident while editing or something. Anyway, fixed.
* | | | | | | prefer `drop_table if_exists: true` over raw SQL.Yves Senn2015-02-1812-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @yahonda This makes it easier for third party adapters to run our tests, even if that database does not support IF EXISTS.
* | | | | | | Merge pull request #18980 from nicolasmlv/fix-typo-in-guideZachary Scott2015-02-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix typo in guide - missing word
| * | | | | | | fix type in guide - missing wordNicolas Maloeuvre2015-02-181-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18843 from yuki24/guides-add-guide-for-mail-previewZachary Scott2015-02-171-0/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add guide for Action Mailer Previews
| * | | | | | | Add guide for Action Mailer PreviewsYuki Nishijima2015-02-081-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Add docs for the type registrySean Griffin2015-02-172-5/+24
| | | | | | | |
* | | | | | | | Rm `Type#type_cast`Sean Griffin2015-02-1713-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper no longer makes sense as a separate method. Instead I'll just have `deserialize` call `cast` by default. This led to a random infinite loop in the `JSON` pg type, when it called `super` from `deserialize`. Not really a great way to fix that other than not calling super, or continuing to have the separate method, which makes the public API differ from what we say it is.
* | | | | | | | `type_cast_from_user` -> `cast`Sean Griffin2015-02-1722-106/+106
| | | | | | | |
* | | | | | | | `type_cast_for_database` -> `serialize`Sean Griffin2015-02-1740-79/+79
| | | | | | | |
* | | | | | | | `Type#type_cast_from_database` -> `Type#deserialize`Sean Griffin2015-02-1736-71/+71
| | | | | | | |
* | | | | | | | Add line endings to files which are missing themSean Griffin2015-02-1716-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files get modified whenever someone uses a tool like `sed`. Let's just get this over with in one commit so it'd not adding diff noise to something else.
* | | | | | | | Fix test failures on Mysql 5.5Sean Griffin2015-02-171-1/+1
| | | | | | | |
* | | | | | | | Update code which depended on methods added by 1502caefSean Griffin2015-02-171-1/+1
| | | | | | | |
* | | | | | | | Revert "Allow `:precision` option for time type columns"Sean Griffin2015-02-177-90/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1502caefd30b137fd1a0865be34c5bbf85ba64c1. The test suite for the mysql adapter broke when this commit was used with MySQL 5.6. Conflicts: activerecord/CHANGELOG.md
* | | | | | | | Merge branch 'y-yagi-fix_deprecate_msg'eileencodes2015-02-171-1/+1
|\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 17:16:55 +0000