aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge pull request #23687 from vipulnsward/add-on-weekdayDavid Heinemeier Hansson2016-02-154-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `#on_weekday?` method to `Date`, `Time`, and `DateTime`.
| * | | | | | | | | | | | | | | Add `#on_weekday?` method to `Date`, `Time`, and `DateTime`.Vipul A M2016-02-154-1/+24
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #23684 from vs4vijay/masterEileen M. Uchitelle2016-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Corrected secret_key_base
| * | | | | | | | | | | | | | Corrected secret_key_basevs4vijay2016-02-151-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #23569 from Gaurav2728/no_doc_of_some_railtie_methodsVipul A M2016-02-151-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark as #:nodoc: [ci skip]
| * | | | | | | | | | | | | | mark as #:nodoc: [ci skip]Gaurav Sharma2016-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can’t be instantiate directly or may be no need for doc.
* | | | | | | | | | | | | | | Merge pull request #23664 from y-yagi/remove_test_order_from_environment_fileYves Senn2016-02-151-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove `active_support.test_order` from environment file
| * | | | | | | | | | | | | | | remove `active_support.test_order` from environment fileyuuji.yaginuma2016-02-141-3/+0
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default test order has been changed to `:random` in 5f777e4b5ee2e3e8e6fd0e2a208ec2a4d25a960d. Therefore, it is no more need to be specified in the environment file.
* | | | | | | | | | | | | | | Merge pull request #23667 from meinac/remove_override_methodYves Senn2016-02-151-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Remove the method already overridden by private method
| * | | | | | | | | | | | | | Remove the method already overridden by private methodMehmet Emin İNAÇ2016-02-141-13/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #23670 from yui-knk/update_dalliYves Senn2016-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | Update dalli gem
| * | | | | | | | | | | | | Update dalli gemyui-knk2016-02-141-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dalli 2.7.6 fixed deprecation warning caused by using `Rack::Session::Abstract::ID`. This commit suppress warnings on ActionPack tests. See: https://github.com/petergoldstein/dalli/commit/9874a7c3ad67eb1e31cafba0a51966db4f0c7e42
* | | | | | | | | | | | | Merge pull request #23678 from kamipo/remove_deprecated_never_unpermitted_paramsEileen M. Uchitelle2016-02-142-16/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`
| * | | | | | | | | | | | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`Ryuta Kamizono2016-02-152-16/+0
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `NEVER_UNPERMITTED_PARAMS` is deprecated in Rails 4.2. See #15933.
* | | | | | | | | | | | | Merge pull request #23505 from kaspth/inject-rails-config-through-railtieKasper Timm Hansen2016-02-146-54/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inject Rails related configuration through Railtie
| * | | | | | | | | | | | | Don't rely on the global server as a receiver.Kasper Timm Hansen2016-02-143-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `WorkerTest`'s `Receiver` is imporsonating an `ActionCable::Connection::Base`, but just delegates the logger to `ActionCable.logger`. This creates a mismatch as the connection requires the logger to be a `TaggedLoggerProxy`'ied logger, while the server doesn't. Thus to ensure an exception isn't raised when the worker tries to call `tag` other tests have to assign a proxied logger to their test server. Instead of forcing change on other tests, have Receiver adhere to the connection contract and use a `TaggedLoggerProxy`. As a consequence remove more setup from the tests.
| * | | | | | | | | | | | | Default connection class to ActionCable::Connection::Base.Kasper Timm Hansen2016-02-144-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of depending on ApplicationCable::Connection being defined at initialize we should inject it in the Railtie. Thus we can kill more setup in the tests too.
| * | | | | | | | | | | | | Inject Rails' channel paths in engine.Kasper Timm Hansen2016-02-145-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were explicitly referencing Rails.root in ActionCable::Server::Configuration.initialize, thereby coupling ourselves to Rails. Instead add `app/channels` to Rails' app paths and assign the existent files to `channel_paths`. Users can still append to those load paths with `<<` and `push` in `config/application.rb`. This means we can remove the custom `Dir` lookup in `channel_paths` and the Rails and root definitions in the tests.
* | | | | | | | | | | | | | Merge pull request #23674 from xw19/dev-tools-updateJon Moss2016-02-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] line_statistics added to README
| * | | | | | | | | | | | | | [ci skip] line_statistics added to READMESourav Moitra2016-02-141-0/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #23648 from xw19/link_to-data-nil-testYves Senn2016-02-142-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Link to data nil test
| * | | | | | | | | | | | | Test to check if the data-attr if nil is same or notSourav Moitra2016-02-142-0/+7
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if data attribute is nil it is ignored if value is nil the pair is ignored if value is nil it is skipped Improved test for data attr nil
* | / / / / / / / / / / / restores the guides layout header [ci skip]Xavier Noria2016-02-131-1/+11
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #23660 from meinac/change_x_gzip_to_gzipJon Moss2016-02-132-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Change x-gzip to gzip in docs [ci skip]
| * | | | | | | | | | | | Change x-gzip to gzip in docs [ci skip]Mehmet Emin İNAÇ2016-02-132-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about GNU zip mime type please check IETF's web site [RFC6713](http://tools.ietf.org/html/rfc6713) or [IANA](http://www.iana.org/assignments/media-types/media-types.xhtml#application)
* | | | | | | | | | | | | Merge pull request #23377 from bogdan/last-with-sqlEileen M. Uchitelle2016-02-134-17/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix AR::Relation#last bugs instroduced in 7705fc
| * | | | | | | | | | | | | Make ActiveRecord::Relation#last to reverse SQL orderBogdan Gusiev2016-02-134-17/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of loading the relation into memory
* | | | | | | | | | | | | | Merge pull request #23654 from kamipo/fix_grammar_a_to_anJon Moss2016-02-1314-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Fix grammar `a` to `an` [ci skip]
| * | | | | | | | | | | | | Fix grammar `a` to `an` [ci skip]Ryuta Kamizono2016-02-1314-14/+14
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #23655 from y-yagi/add_missing_option_to_exampleKasper Timm Hansen2016-02-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | add missing name option to flash test example [ci skip]
| * | | | | | | | | | | | | add missing name option to flash test example [ci skip]yuuji.yaginuma2016-02-131-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #23653 from kamipo/add_missing_author_nameVipul A M2016-02-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | Add the missing author name [ci skip]
| * | | | | | | | | | | | | Add the missing author name [ci skip]Ryuta Kamizono2016-02-131-0/+2
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The author name was lost in the merge commit 6fedc7d.
* / / / / / / / / / / / / push kwargs up to the user facing APIAaron Patterson2016-02-123-13/+13
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this lets us leverage Ruby's kwarg handling (exceptions for missing params, etc) ASAP which allows us to skip active support method calls and make sure the exception stack is closer to where the user called the methods.
* | | | | | | | | | | | Fix expected hash syntax.Kasper Timm Hansen2016-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f70e8bd2 set a new bar for tests, but they weren't updated. Update their expectation.
* | | | | | | | | | | | Prefer empty? to any?.Kasper Timm Hansen2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the collection isn't empty any? will loop through it. Spare the loop and be more concise with what we're asking the collection about.
* | | | | | | | | | | | Stop mutating return value.Kasper Timm Hansen2016-02-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `PartialRenderer.render_collection_with/without_template` returns an array of rendered partials. Avoid dup'ing and shifting it by indexing into the collection instead.
* | | | | | | | | | | | Inline `fetch_or_cache_partial`.Kasper Timm Hansen2016-02-121-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wasn't pulling its weight for a simple yield anymore.
* | | | | | | | | | | | Write to collection cache where the template is rendered.Kasper Timm Hansen2016-02-122-9/+15
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves us closer to having access to a local template variable, we can ask for eligibility and its virtual_path. Currently we rely on `@template`, which we don't have available when rendering collections without a fixed template.
* | | | | | | | | | | Only write to collection cache if we have a callable cache key.Kasper Timm Hansen2016-02-122-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A callable cache key writes to the collection cache under a certain namespace. Which means if we don't have scoped cache key we can just rely on the `cache model_name do` in the templates to cache them. Less writes, more sharing. Add `assert_customer_cached` to better illustrate this in tests, and remove tests which then don't communicate as much.
* | | | | | | | | | | Check `partial_rendered_times` to clarify expectations.Kasper Timm Hansen2016-02-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was difficult to see when the partials were rendered, and how many times we expected it to be rendered before. Because we weren't explaining it.
* | | | | | | | | | | Use Ruby 1.9 hash syntaxRafael Mendonça França2016-02-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Remove useless callable_cache_key? check.Kasper Timm Hansen2016-02-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `automatic_cache_eligible?´ is only called if there was no `:cache` key to fetch in the `@options` via `cache_collection?`. So the check will always be false.
* | | | | | | | | | | Test collection caching with callable cache key.Kasper Timm Hansen2016-02-121-0/+25
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When people pass `cache: -> item { item.upcase }` they scope the collection cache keys so the individual partial cache isn't reused. Test that behavior.
* | | | | | | | | | the lookup context looks in the cwd, so prefix isn't necessaryAaron Patterson2016-02-121-2/+1
| | | | | | | | | |
* | | | | | | | | | use a real LookupContext in the digest testsAaron Patterson2016-02-121-28/+6
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure that the digestor stays in parity with the LookupContext object.
* | | | | | | | | Remove single_template_render? method.Kasper Timm Hansen2016-02-121-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Written when I didn't understand the internals as well. Action View generally just refers to `@template` when meaning a fixed template render. So follow that implicit convention.
* | | | | | | | | Don't search in locals for cache_options.Kasper Timm Hansen2016-02-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only support a top level `cache_options`. We also don't have to default the options to a hash as Active Support's cache defaults that arg to nil.
* | | | | | | | | use assert_not_equal so there will be better error messagesAaron Patterson2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the case of failure it is nice to see what the two digests are.
* | | | | | | | | use kwargs to avoid hash slicingAaron Patterson2016-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we can use kwargs in this case to avoid values_at and except calls on the options hash
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 18:54:33 +0000