aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs, `ActiveRecord::JoinDependency` is not part of the public API.Yves Senn2015-11-071-1/+1
| | | | | | | [ci skip] While `JoinDependency` and `JoinDependency::Aliases` were nodoced, the inner `Table` class made them appear in the API.
* docs, `ActiveRecord::TypeCaster` is not part of the public API.Yves Senn2015-11-073-3/+3
| | | | [ci skip]
* Merge pull request #22197 from grosser/grosser/fetchKasper Timm Hansen2015-11-072-11/+14
|\ | | | | do not override fetch on local cache
| * do not override fetch on local cacheMichael Grosser2015-11-072-11/+14
| | | | | | | | | | | | fetch is supposed to behave differently, this was a mistake merged in https://github.com/rails/rails/pull/22194
* | Merge pull request #21806 from kachick/fix-transformer-sizeEileen M. Uchitelle2015-11-074-8/+12
|\ \ | | | | | | Return a sized Enumerator from Hash#transform_values{!}
| * | Return a sized Enumerator from Hash#{transform_values{!}|transform_keys{!}}Kenichi Kamiya2015-09-294-8/+12
| | |
* | | Fix test failuresSean Griffin2015-11-071-0/+1
| | | | | | | | | | | | | | | The previous commit changes the state of the class, and while we are cleaning up the database, I forgot to clean up the class
* | | Ensure `#reset_column_information` clears child classes as wellSean Griffin2015-11-073-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added a redundant test for this under the attributes API as well, as that also causes this bug to manifest through public API (and demonstrates that calling `reset_column_information` on the child classes would be insufficient) Since children of a class should always share a table with their parent, just reloading the schema from the cache should be sufficient here. `reload_schema_from_cache` should probably become public and `# :nodoc:`, but I'd rather avoid the git churn here. Fixes #22057
* | | Merge pull request #22213 from y-yagi/remove_deprecated_option_from_guideRichard Schneeman2015-11-071-15/+0
|\ \ \ | | | | | | | | remove deprecated `:tokenizer` option from guide [ci skip]
| * | | remove deprecated `:tokenizer` option from guide [ci skip]yuuji.yaginuma2015-11-071-15/+0
| | | | | | | | | | | | | | | | `:tokenizer` option was deprecated in 1c341eb7cbaeb52435f14c2595e391bfb2e5e38b
* | | | Merge pull request #22145 from atul-shimpi/masterYves Senn2015-11-071-2/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | guides, the required option in generators is no longer available. [ci skip]
| * | | Issue #22139 : Edge Guides - ActiveRecord Migrations - Remove required ↵atul-shimpi2015-11-011-2/+0
| | | | | | | | | | | | | | | | option for column
* | | | Merge pull request #22211 from atul-shimpi/masterKasper Timm Hansen2015-11-071-1/+1
|\ \ \ \ | | | | | | | | | | Add comma to to make the information clear
| * | | | Add comma to to make the information clearUbuntu2015-11-071-1/+1
| | | | |
* | | | | Fix wrong `assert_equal` argument order.Kasper Timm Hansen2015-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | It goes expected, then actual. Only changed this because the file was just touched (please don't submit pull requests :)).
* | | | | Merge pull request #22207 from yui-knk/suppress_warningsKasper Timm Hansen2015-11-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Suppress warning (warning about assigned but unused variable)
| * | | | Suppress warning (warning about assigned but unused variable)yui-knk2015-11-071-1/+1
|/ / / / | | | | | | | | | | | | | | | | These warings have been appeared from https://github.com/rails/rails/commit/92bc8cdb0771bf6ffcfb31ef58dba529527b514c
* | | | Merge pull request #21967 from kevinbuch/connection-middleware-mutationRichard Schneeman2015-11-063-4/+15
|\ \ \ \ | | | | | | | | | | Avoid mutating original response in connection management middleware
| * | | | Avoids mutating the original response in connection management middlewareKevin Buchanan2015-11-063-4/+15
|/ / / /
* | | | Merge pull request #22203 from cllns/guides-has-many-through-join-modelsEileen M. Uchitelle2015-11-061-2/+4
|\ \ \ \ | |_|_|/ |/| | | Clarify automatic creation/deletion of join models for has_many through
| * | | Clarify automatic creation/deletion of join models for has_many throughSean Collins2015-11-061-2/+4
| | | | | | | | | | | | | | | | [ci-skip]
* | | | Merge pull request #22193 from grosser/grosser/multiEileen M. Uchitelle2015-11-061-3/+3
|\ \ \ \ | | | | | | | | | | call local_cache 1 time instead of 3 times
| * | | | call local_cache 1 time instead of 3 timesMichael Grosser2015-11-061-3/+3
| |/ / / | | | | | | | | | | | | | | | | LocalCache read_entry previously called the local_cache method 3 times, now it only calls it once and keeps the result in a local variable.
* | | | Merge pull request #22200 from grosser/grosser/prependKasper Timm Hansen2015-11-063-30/+27
|\ \ \ \ | |/ / / |/| | | use prepend instead of extending every instance
| * | | use prepend instead of extending every instanceMichael Grosser2015-11-063-30/+27
|/ / / | | | | | | | | | | | | extending an instance with a module puts the methods on top of it, prepend does the same but on the class level, so less work for us and more standard way of doing things
* | | Merge pull request #22194 from grosser/grosser/read-nilSean Griffin2015-11-052-3/+14
|\ \ \ | | | | | | | | cache nil replies from backend cache so misses are fast too
| * | | cache nil replies from backend cache so misses are fast tooMichael Grosser2015-11-052-3/+14
| | | |
* | | | Merge pull request #22150 from raq929/patch-1Yves Senn2015-11-051-2/+4
|\ \ \ \ | | | | | | | | | | Update association_basics.md [ci skip]
| * | | | Update association_basics.mdraq9292015-11-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the definition of an association to the top of the page. I am just starting to learn Rails, and having this definition at the top instead of in the second section would be really useful. Updates the Types of Associations section for clarity. Moves the list of associations before the explanation. Links to wikipedia articles on Primary and Foreign keys.
* | | | | [ci skip] ( ͡° ͜ʖ ͡°) ( ͡⊙ ͜ʖ ͡⊙) ( ͡◉ ͜ʖ ͡◉) ↵Kasper Timm Hansen2015-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javascript => JavaScript JavaScript is spelled with a capital J and S.
* | | | | [ci skip] Remove final mentions of `static_cache_control` in docs.Kasper Timm Hansen2015-11-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was deprecated in https://github.com/rails/rails/pull/19135. We're now favoring `public_file_server.headers`.
* | | | | Merge pull request #22187 from ↵Andrew White2015-11-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/test_binary_data_is_not_logged_is_for_prepared_statements `test_binary_data_is_not_logged` is for prepared statements logging
| * | | | | `test_binary_data_is_not_logged` is for prepared statements loggingRyuta Kamizono2015-11-051-1/+1
| | | | | |
* | | | | | Merge pull request #22189 from ↵Yves Senn2015-11-052-24/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/no_need_mysql_doubles_reset_column_information No need `MysqlDouble` and `MysqlDouble.reset_column_information`
| * | | | | | No need `MysqlDouble` and `MysqlDouble.reset_column_information`Ryuta Kamizono2015-11-052-24/+12
| | | | | | |
* | | | | | | Merge pull request #22191 from ↵Kasper Timm Hansen2015-11-051-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | jonatack/fix-static-cache-control-deprecation-warning Fix `static_cache_control` deprecation warning
| * | | | | | Fix `static_cache_control` deprecation warningJon Atack2015-11-051-3/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix the message by wrapping the value in missing quotes and adding the missing backtick at the end. Finally, :lipstick: by adding a space inside the curly braces. Before: `config.public_file_server.headers = {'Cache-Control' => public, max-age=31536000} Now: `config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' }` 2. Display `static_cache_control` instead of static_cache_control. This follows what the 2 neighboring methods are doing. 3. Use strip_heredoc to improve the code formatting and readability like the 2 neighboring methods and wrap to 80 characters.
* | | | | | Require the count_down_latchRafael Mendonça França2015-11-051-2/+3
| | | | | |
* | | | | | Merge pull request #22185 from jdantonio/cr-load-timeRafael França2015-11-0523-25/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Require only necessary concurrent-ruby classes.
| * | | | | | Require only necessary concurrent-ruby classes.Jerry D'Antonio2015-11-0423-25/+27
| | | | | | |
* | | | | | | Remove links to docrailsRafael Mendonça França2015-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | docrails is a private repository now to avoid pull requests to it.
* | | | | | | Add bundle check to release taskRafael Mendonça França2015-11-051-1/+5
|/ / / / / /
* | | | | | tests, test should not care wether 9ms or 11ms have passed.Yves Senn2015-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves: ``` Expected /Completed 200 OK in [\d]ms/ to match "Completed 200 OK in 943ms". ```
* | | | | | Replace `serve_static_files` mentions in docs.Kasper Timm Hansen2015-11-044-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should use `public_file_server.enabled` instead. Clarified that static files will be served from the public directory, where it made sense. Also removed occurrence of the deprecated `static_cache_control`.
* | | | | | Replace `serve_static_files` in tests with `public_file_server.enabled`.Kasper Timm Hansen2015-11-044-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to do it in 748b2f9, when deprecating `serve_static_files`.
* | | | | | tests, define `Rails.root` before loading Action Mailer.Yves Senn2015-11-042-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `bin/test` would define `Rails.root` before loading AM but `bundle exec rake` would define it after loading AM, this lead to the following test failure when using `bin/test`: ``` --- expected +++ actual @@ -1 +1 @@ -{:location=>"/var/folders/_r/9kh50y4j0vn7zgg2p65z1lcm0000gn/T/mails"} +{:location=>"/Users/senny/Projects/rails/actionmailer/tmp/mails"} ``` This patch ensures that `Rails.root` is defined when loading AM to achieve consistent test results.
* | | | | | Merge pull request #22173 from kaspth/enable-public-file-serverKasper Timm Hansen2015-11-047-17/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add enabled flag to the public file server settings.
| * | | | | | Move `static_cache_contorl` deprecation changelog entry to Railties.Kasper Timm Hansen2015-11-042-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration for `config.static_cache_control`, and its replacement `config.public_file_server.headers` are implemented in Railties. People would configure this in environment files, which is Railties domain too.
| * | | | | | Add enabled flag to the public file server.Kasper Timm Hansen2015-11-036-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://github.com/rails/rails/pull/19135#issuecomment-153385986. Replaces `serve_static_files` to unify the static options under the `public_file_server` wing. Deprecates `serve_static_files` accessors, but make them use the newer config internally.
* | | | | | | Merge pull request #22182 from seanlinsley/patch-1Rafael França2015-11-041-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | document `try!` in ActiveSupport core ext guide
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:08:33 +0000