aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | document `try!` in ActiveSupport core ext guideSean Linsley2015-11-041-0/+7
|/ / / / / | | | | | | | | | | https://twitter.com/avdi/status/660141673993777156
* | | | | Merge pull request #22180 from usertesting/arbitrary-url-in-link-to-backRafael França2015-11-043-2/+33
|\ \ \ \ \ | | | | | | | | | | | | Don’t allow arbitrary data in back urls
| * | | | | Don’t allow arbitrary data in back urlsDamien Burke2015-11-033-2/+33
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `link_to :back` creates a link to whatever was passed in via the referer header. If an attacker can alter the referer header, that would create a cross-site scripting vulnerability on every page that uses `link_to :back` This commit restricts the back URL to valid non-javascript URLs. https://github.com/rails/rails/issues/14444
* | | | | formatting pass over Active Record changelog. [ci skip]Yves Senn2015-11-041-18/+20
| | | | |
* | | | | Merge pull request #22174 from metaskills/defsetupYves Senn2015-11-043-7/+6
|\ \ \ \ \ | | | | | | | | | | | | Update docs/comments to use setup/teardown blocks vs. methods. [ci skip]
| * | | | | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | * Remove super for setup block. Not needed.
| * | | | | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-033-6/+6
| |/ / / / | | | | | | | | | | | | | | | As discussed in the minitest-spec-rails issue (http://git.io/vlHxx) Rails uses setup/teardown callbacks. Defining `setup` or `teardown` methods vs. blocks will yield inconsistent behavior in the callback chain.
* | / / / Remove incorrect commentsAndrew White2015-11-041-4/+0
| |/ / / |/| | | | | | | | | | | | | | | | | | | Columns are no longer stored in an attribute since b8a533d. [ci skip]
* | | | Fix spelling error [ci skip]Andrew White2015-11-041-1/+1
| | | |
* | | | don't start a new process for every test fileAaron Patterson2015-11-031-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we can just reuse the parent process. We should figure out what files are commonly required among the test files and try to require them in the parent so that the require time cost is amortized across the processes.
* | | | Fix deprecation message when frame doesn't have absolute_pathRafael Mendonça França2015-11-031-1/+1
|/ / / | | | | | | | | | | | | | | | When a frame is an eval block without filename argument there is no absolute_path so the previous implementation would fail because `nil` doesn't responds to `start_with?`.
* | | Add tests to make sure mail_to work with nil and SafeBufferRafael Mendonça França2015-11-031-0/+14
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 23:31:28 +0000