aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* `join_to_delete` is same as `join_to_update`Ryuta Kamizono2015-12-173-11/+5
| | | | Reapply #22615.
* Merge pull request #22616 from gfvcastro/test-ruby-2-2-4Rafael França2015-12-171-1/+1
|\ | | | | Test against Ruby 2.2.4 on Travis.
| * Test against Ruby 2.2.4 on Travis.Gustavo Villa2015-12-161-1/+1
| |
* | Merge pull request #22618 from y-yagi/fix_method_name_typoRafael França2015-12-171-1/+1
|\ \ | | | | | | fix typo in method name [ci skip]
| * | fix typo in method name [ci skip]yuuji.yaginuma2015-12-171-1/+1
|/ / | | | | | | It was changed by mistake at 428d47adfed8d6aa7b21aec2bf5ad890961c9de3
* | Revert "Merge pull request #22615 from ↵Rafael Mendonça França2015-12-173-5/+11
| | | | | | | | | | | | | | | | | | | | kamipo/join_to_delete_is_same_as_join_to_update" This reverts commit 4d06ea9a829de8f6f5a345589828e182eacab6a3, reversing changes made to e9d15072a94e2ae4dec5b7a121c84a5db38547b8. Reason: This will break oracle-enhanced, see https://github.com/rsim/oracle-enhanced/blob/3c42131db82b64ac41645db3affc6e4650289df6/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L1254
* | Merge pull request #22615 from kamipo/join_to_delete_is_same_as_join_to_updateRafael França2015-12-173-11/+5
|\ \ | |/ |/| `join_to_delete` is same as `join_to_update`
| * `join_to_delete` is same as `join_to_update`Ryuta Kamizono2015-12-173-11/+5
| |
* | Merge pull request #22592 from nwjsmith/disable-logger-message-broadcastsEileen M. Uchitelle2015-12-163-23/+40
|\ \ | | | | | | Add Logger option to disable message broadcasts
| * | Add Logger option to disable message broadcastsNate Smith2015-12-163-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the Rails logger to log to STDOUT, it would broadcast the log twice in development. This adds a setting that will prevent messages from being broadcast to multiple logs, while still allowing calls to `#close`, `#level=`, `#progname=`, and `#formatter=` to be broadcasted. Fixes #14769, #11415
* | | Make sure File.exist? run in the root of the applicationRafael Mendonça França2015-12-161-1/+5
| | |
* | | Do not define attributes_with_index as a Thor taskRafael Mendonça França2015-12-161-4/+4
| | | | | | | | | | | | | | | All public methods are tasks, so we need to move it to protected visibility.
* | | Remove dead codeRafael Mendonça França2015-12-161-4/+0
| | |
* | | Don't over-specify types in our testsSean Griffin2015-12-161-1/+0
| |/ |/| | | | | | | | | | | This test was failing when run on Windows using PostgreSQL. Depending on the OS (and 32 vs 64 bit), this type could be a `BigNum`. We could loosen the assertion to `Numeric`, but if the value is equal to the expected, and responds to `bitlength` properly, who cares?
* | Add mysql back to the GemfileSean Griffin2015-12-162-2/+2
| | | | | | | | I didn't mean to commit that!
* | Fix test failures on WindowsSean Griffin2015-12-162-5/+13
| | | | | | | | | | | | | | Unlike unix, the TZ variable on Windows does not look at a database. It is always expected to be in the form {Standard Time Abbreviation}{UTC-Offset}{Daylight Time Abbriviation}. This changes the relevant tests to use the Windows form when run from Windows.
* | Fix documentation about ApplicationRecordRafael Mendonça França2015-12-161-1/+1
| | | | | | | | [ci skip]
* | Merge pull request #22506 from derekprior/dp-redirect_to_back_or_defaultSean Griffin2015-12-165-12/+80
|\ \ | | | | | | Add `redirect_to_back_or_default`
| * | Deprecate `redirect_to :back`Derek Prior2015-12-164-21/+31
| | | | | | | | | | | | | | | | | | | | | Applications that use `redirect_to :back` can be forced to 500 by clients that do not send the HTTP `Referer` (sic) header. `redirect_back` requires the user to consider this possibility up front and avoids this trivially-caused application error.
| * | Add `redirect_back` for safer referrer redirectsDerek Prior2015-12-165-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `redirect_to :back` is a somewhat common pattern in Rails apps, but it is not completely safe. There are a number of circumstances where HTTP referrer information is not available on the request. This happens often with bot traffic and occasionally to user traffic depending on browser security settings. When there is no referrer available on the request, `redirect_to :back` will raise `ActionController::RedirectBackError`, usually resulting in an application error. `redirect_back` takes a required `fallback_location` keyword argument that specifies the redirect when the referrer information is not available. This prevents 500 errors caused by `ActionController::RedirectBackError`.
* | | Fix test failure on WindowsSean Griffin2015-12-161-6/+10
| | | | | | | | | | | | | | | | | | | | | When this test was run on Windows, the database file would still be in use, and `File.unlink` would fail. This would cause the temp directory to be unable to be removed, and error out. By disconnecting the connection when finished, we can avoid this error.
* | | Merge branch 'sprockets-3'Rafael Mendonça França2015-12-165-58/+40
|\ \ \
| * | | Use sprockets 3 in the Rails 5 releaseRafael Mendonça França2015-12-165-57/+46
| | | |
* | | | Merge pull request #22556 from imanel/range_prependKasper Timm Hansen2015-12-161-10/+7
|\ \ \ \ | | | | | | | | | | Use Module.prepend instead of alias_method for Range#to_s
| * | | | Use Module.prepend instead of alias_method for Range#to_sBernard Potocki2015-12-161-10/+7
| | | | |
* | | | | Merge pull request #17845 from gsamokovarov/qualified-constRafael França2015-12-163-74/+107
|\ \ \ \ \ | | | | | | | | | | | | Don't leak Object constants in core_ext/module/qualified_const
| * | | | | Don't leak Object constants in core_ext/module/qualified_constGenadi Samokovarov2015-12-163-74/+107
| | |/ / / | |/| | |
* / | | | Avoid conditionals in the GemfileSean Griffin2015-12-162-6/+16
|/ / / / | | | | | | | | | | | | | | | | "conditionals in the gemfile creates conditional code in the Gemfile.lock. Since it is checked in the repository I think it is better to avoid it"
* | | | Require a version of bcrypt that works on Windows when neededSean Griffin2015-12-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | bcrypt 3.1.0 doesn't load on Windows. See https://github.com/codahale/bcrypt-ruby/issues/128 for details.
* | | | Merge pull request #22567 from gsamokovarov/introduce-application-recordRafael França2015-12-1616-134/+200
|\ \ \ \ | | | | | | | | | | Introduce ApplicationRecord, an Active Record layer supertype
| * | | | Introduce ApplicationRecord, an Active Record layer supertypeGenadi Samokovarov2015-12-1616-134/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's pretty common for folks to monkey patch `ActiveRecord::Base` to work around an issue or introduce extra functionality. Instead of shoving even more stuff in `ActiveRecord::Base`, `ApplicationRecord` can hold all those custom work the apps may need. Now, we don't wanna encourage all of the application models to inherit from `ActiveRecord::Base`, but we can encourage all the models that do, to inherit from `ApplicationRecord`. Newly generated applications have `app/models/application_record.rb` present by default. The model generators are smart enough to recognize that newly generated models have to inherit from `ApplicationRecord`, but only if it's present.
* | | | | Add additional platforms for WindowsSean Griffin2015-12-161-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | It appears that MRI on Windows can also appear as `:mingw`, if it was installed via RubyInstaller.
* | | | Merge pull request #22605 from tonyta/delete-dead-commentsRafael França2015-12-165-39/+0
|\ \ \ \ | | | | | | | | | | Delete dead code comments
| * | | | delete code commented out (and replaced) in e93d0a5Tony Ta2015-12-151-1/+0
| | | | |
| * | | | deletes commented code introduced in f238d495Tony Ta2015-12-151-5/+0
| | | | | | | | | | | | | | | | | | | | ActiveSupport::Multibyte::Unicode::Codepoint doesn't support this API
| * | | | deletes commented code introduced in db045db (initial commit)Tony Ta2015-12-152-18/+0
| | | | |
| * | | | deletes commented code introduced in 4673c47dTony Ta2015-12-151-5/+0
| | | | |
| * | | | deletes code commented out in 72160d9fTony Ta2015-12-151-10/+0
| | | | |
* | | | | Ensure we install the database backend gems on WindowsSean Griffin2015-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform `:ruby` is only MRI on Linux or Mac. Windows MRI shows up as `:mswin` or `:mswin64` depending on if it was installed as 32 or 64 bit. I am unsure if this will cause conflicts with JRuby on Windows, but I don't have the means to test this at the moment.
* | | | | Merge pull request #22598 from yui-knk/deprecate_string_callbackRafael França2015-12-168-23/+31
|\ \ \ \ \ | | | | | | | | | | | | Deprecate passing string to define callback.
| * | | | | Deprecate passing string to define callback.yui-knk2015-12-168-23/+31
| | | | | |
* | | | | | Merge pull request #22611 from existent-co-uk/patch-1Rafael França2015-12-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a couple of grammatical errors in security.md
| * | | | | | Fix a couple of grammatical errors in security.mdExistent Ltd2015-12-161-2/+2
| | | | | | |
* | | | | | | Merge pull request #22612 from caike/masterEileen M. Uchitelle2015-12-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Mention the correct way to halt callback chains
| * | | | | | Mention the correct way to halt callback chainsCarlos Souza2015-12-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The previous title was misleading. [ci skip]
* | | | | | Merge branch 'remove-test-case'eileencodes2015-12-159-52/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Run railties generated app tests in test enveileencodes2015-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running railties generated app tests in development env can cause unintended consequences. The environments are different and tests aren't meant to be run in development mode. The changes to the generator exposed this issue where the random test order in the generated apps could cause problems when those tests are run in development mode. Particularly we saw failures in `railties/test/application/rake_test.rb` generated apps that used the scaffold to create applications and then run the migration and immediately run the tests. The error we saw was `ActiveRecord::RecordNotFound: Couldn't find User with 'id'=980190962` and seemed to only occur if the destroy test ran first. I'm not entirely sure _why_ this causes that error to be thrown but I believe it is related to the environments being different.
| * | | | | Update test generators to use ActionDispatch::IntegrationTestAbdelkader Boudih2015-12-158-49/+61
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.1 `ActionController::TestCase` will be moved out of Rails into it's own gem. Please use `ActionDispatch::IntegrationTest` going forward. This changes the generators to use `ActionDispatch::IntegrationTest` and the required URL setup (rather than symbols) for each of the controller actions. Updated fix to #22076.
* | | | | Do not default to any SerializerSantiago Pastorino2015-12-153-8/+2
| | | | | | | | | | | | | | | | | | | | We will wait until 5.1 to make a decision
* | | | | Merge pull request #22562 from sblackstone/masterJeremy Daer2015-12-152-2/+9
|\ \ \ \ \ | | | | | | | | | | | | Allow users to pass flags from database.yml
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 09:44:48 +0000