aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #14396 from afshinator/masterJeremy Kemper2014-03-151-11/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reword 5.6 strong parameters and private method stuff [ci skip]
| * | | | | | Reword 5.6 strong parameters and private method stuff [ci skip]Afshin Mokhtari2014-03-151-11/+28
| | | | | | |
* | | | | | | Merge pull request #14395 from arthurnn/fix_mailer_preview_testJeremy Kemper2014-03-151-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix MailerPreview broken tests
| * | | | | | | Fix MailerPreview broken testsArthur Neves2014-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BaseMailerPreview.welcome` is an instance method, so we need to stub the method on a instance level and not on Class. The stub is important to make sure the Message object is the same in the other expectations. This was working randomly because Mocha uses == to compare two objects on the `with()` expectation and even if the Mail::Message objects were not the same object they are equal, but thats not the case in 100% of the runs. So we need to make sure we use `.any_instance` method and have the right message object.
* | | | | | | | Merge pull request #12662 from nashby/include-hidden-collectionRafael Mendonça França2014-03-153-3/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add include_hidden option to collection_check_boxes helper Conflicts: actionview/CHANGELOG.md actionview/test/template/form_collections_helper_test.rb
| * | | | | | | add include_hidden option to collection_check_boxes helperVasiliy Ermolovich2013-10-273-4/+19
| | | | | | | |
* | | | | | | | Merge pull request #14394 from zoltankiss/fix_typoArthur Neves2014-03-151-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor grammer, code conventions fix [ci skip]
| * | | | | | | | Minor grammer, code conventions fix [ci skip]Zoltan Kiss2014-03-151-2/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
* | | | | | | | Clarify AV::Digestor.digest method signature docs and deprecation warningJeremy Kemper2014-03-152-24/+23
| | | | | | | |
* | | | | | | | Remove deprecation on active_support/core_ext/class/attribute_accessors ↵Jeremy Kemper2014-03-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requires. Appropriate to keep this, users don't care that the implementation got unified.
* | | | | | | | Merge pull request #14380 from ↵Yves Senn2014-03-1549-61/+51
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | tgxworld/use_teardown_helper_method_in_activerecord Use teardown helper method.
| * | | | | | | Use teardown helper method.Guo Xiang Tan2014-03-1449-61/+51
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-Up to https://github.com/rails/rails/pull/14348 Ensure that SQLCounter.clear_log is called after each test. This is a step to prevent side effects when running tests. This will allow us to run them in random order.
* | | | | | | Obey `validate: false` option for habtmCarlos Antonio da Silva2014-03-144-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14383.
* | | | | | | Merge pull request #14387 from huoxito/touch-api-docArthur Nogueira Neves2014-03-141-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update callbacks executed on AR::Base#touch [skip ci]
| * | | | | | | Update callbacks executed on AR::Base#touch [skip ci]Washington Luiz2014-03-141-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | As of https://github.com/rails/rails/pull/12031 after_commit and after_rollback are also executed
* | | | | | | Merge pull request #10278 from codeodor/fix-to_json-for-EnumerableGodfrey Chan2014-03-144-12/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #to_json for BasicObject Enumerables
| * | | | | | | Fix #to_json for BasicObject EnumerablesSammy Larbi2014-03-144-12/+40
| |/ / / / / /
* | | | | | | Merge pull request #14373 from schneems/schneems/jdbc-ar-2Rafael Mendonça França2014-03-143-6/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow custom JDBC urls
| * | | | | | | better test error messagesschneems2014-03-141-4/+4
| | | | | | | |
| * | | | | | | Allow custom JDBC urlsschneems2014-03-142-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mitigates #14323
* | | | | | | | Fix the resolver cache and stop mutating the lookup_contextRafael Mendonça França2014-03-144-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find
* | | | | | | | Merge pull request #14329 from pch/digestor-lookup-fixRafael Mendonça França2014-03-1412-33/+130
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | Ensure LookupContext in Digestor selects correct variant
| * | | | | | | Introduce #with_formats_and_variants to prevent problems with mutating ↵Łukasz Strzałkowski2014-03-144-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finder object
| * | | | | | | Add mocked disable_cache for FixtureFinderŁukasz Strzałkowski2014-03-141-0/+4
| | | | | | | |
| * | | | | | | Set format in finderŁukasz Strzałkowski2014-03-141-3/+8
| | | | | | | |
| * | | | | | | Rename _setup_options to _options_for_digestŁukasz Strzałkowski2014-03-141-3/+3
| | | | | | | |
| * | | | | | | Disable LookupContext's cache when looking for templateŁukasz Strzałkowski2014-03-141-2/+6
| | | | | | | |
| * | | | | | | Don't pass hash as keys to #find methodŁukasz Strzałkowski2014-03-141-1/+1
| | | | | | | |
| * | | | | | | Add variants to Template classŁukasz Strzałkowski2014-03-143-12/+20
| | | | | | | |
| * | | | | | | Don't create addition vars, use options[] directlyŁukasz Strzałkowski2014-03-131-7/+2
| | | | | | | |
| * | | | | | | Don't pass variant in params, it's ignoredŁukasz Strzałkowski2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're setting variant above, in request object directly
| * | | | | | | Ensure LookupContext in Digestor selects correct variantPiotr Chmolowski2014-03-098-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to: #14242 #14243 14293 Variants passed to LookupContext#find() seem to be ignored, so I've used the setter instead: `finder.variants = [ variant ]`. I've also added some more test cases for variants. Hopefully this time passing tests will mean it actually works.
* | | | | | | | Take in consideration guides CHANGELOGRafael Mendonça França2014-03-141-2/+2
| | | | | | | |
* | | | | | | | Match the whole stringRafael Mendonça França2014-03-141-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility errorRafael Mendonça França2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information
* | | | | | | Avoid duplicated conditionalsCarlos Antonio da Silva2014-03-141-2/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #14378 from afshinator/masterGodfrey Chan2014-03-131-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix probs in sections 5.6 and 5.9; [ci skip]
| * | | | | | Fix probs in sections 5.6 and 5.9; [ci skip]Afshin Mokhtari2014-03-131-3/+3
| | | | | | |
* | | | | | | No need to binds be optionalRafael Mendonça França2014-03-131-2/+2
|/ / / / / /
* | | | | | Merge pull request #14372 from arthurnn/fix_query_cache_bindsRafael Mendonça França2014-03-134-12/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make select_all on query cache accept a Relation without binds.
| * | | | | | Make select_all on query cache accept a Relation without binds.Arthur Neves2014-03-134-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [fixes #14361] [related #13886]
* | | | | | | Merge pull request #14376 from laurocaetano/test-deprecation-warning-for-findGodfrey Chan2014-03-131-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add test for deprecation warning for passing an AR object to `find`.
| * | | | | | | Add test for deprecation warning for passing an AR object to `find`.Lauro Caetano2014-03-131-0/+6
|/ / / / / / /
* | | | | | | Merge pull request #14375 from laurocaetano/test-deprecation-warning-for-existsAaron Patterson2014-03-131-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add test for deprecation warning for passing an AR object to `exists?`.
| * | | | | | | Test deprecation warning for passing an ActiveRecord object toLauro Caetano2014-03-131-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | `exists?`
* / / / / / / require actions rather than create_fileAaron Patterson2014-03-131-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319
* | | | | | passing an instance of an AR object to `find` is deprecatedAaron Patterson2014-03-135-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | please pass the id of the AR object by calling `.id` on the model first.
* | | | | | passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-135-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the id of the object to the method by calling `.id` on the AR object.
* | | | | | make tests pass on Ruby 2.2Aaron Patterson2014-03-132-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593
* | | | | | Use Sqlite3 adapter in examplesJulian Simioni2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 01:16:16 +0000