aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Spelling errorsjbsmith862014-08-143-4/+4
|
* Merge pull request #16504 from schneems/schneems/fix_url_forAaron Patterson2014-08-141-1/+3
|\ | | | | Perf optimization for `url_for` called w/ Hash
| * Perf optimization for `url_for` called w/ Hashschneems2014-08-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmarking the existing code: ```ruby { :only_path => options[:host].nil? }.merge!(options.symbolize_keys)) ``` Against optimized code, that does not require a new hash or a merge: ```ruby options = options.symbolize_keys options[:only_path] = options[:host].nil? unless options.key?(:only_path) options ``` We see a statistically significant performance gain: ![](https://www.dropbox.com/s/onocpc0zfw4kjxl/Screenshot%202014-08-14%2012.45.30.png?dl=1) Updated to not mutate incoming parameters
* | Ignore MySQL "SHOW VARIABLES" when counting queriesAkira Matsuda2014-08-151-1/+1
| |
* | extract methods and metaprogram less.Aaron Patterson2014-08-141-11/+16
| |
* | Be sure to reset PK name renamed in the testAkira Matsuda2014-08-151-0/+3
| |
* | Use string for order argument, fixed from #16501 [ci skip]Zachary Scott2014-08-141-1/+1
| |
* | Merge pull request #16501 from tomkadwill/update_delete_to_new_styleZachary Scott2014-08-141-1/+1
|\ \ | | | | | | [ci skip] updated 'where' in association documention to new style syntax
| * | [ci skip] updated 'where' in association documention to new style syntaxTom Kadwill2014-08-141-1/+1
| | |
* | | Warm up Symbols with where methodAkira Matsuda2014-08-151-1/+1
| |/ |/| | | | | Looks like #first wasn't warm enough...
* | Merge pull request #16502 from bogdan/where-hash-nested-relationSantiago Pastorino2014-08-142-3/+24
|\ \ | | | | | | [Regression 4.0 -> 4.1] Fixed AR::Relation#where edge case with Hash and other Relation
| * | Fixed AR::Relation#where edge case with Hash and other RelationBogdan Gusiev2014-08-142-3/+24
| | | | | | | | | | | | | | | | | | Example: Author.where(posts: { author_id: Author.where(country_id: 1) }).joins(:posts)
* | | Merge pull request #16438 from agrobbin/input-placeholder-i18nJeremy Kemper2014-08-145-0/+214
|\ \ \ | | | | | | | | Add I18n support for `:placeholder` HTML option is passed to form fields
| * | | add I18n support for `:placeholder` HTML option is passed to form fieldsAlex Robbin2014-08-125-0/+214
| | | |
* | | | Ignore SCHEMA queries in some habtm testsAkira Matsuda2014-08-141-4/+4
| | | |
* | | | Merge pull request #8813 from ↵Yves Senn2014-08-143-1/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | greyblake/dont_write_timestamps_if_they_are_not_attributes Write timestamps only if there are timestamps columns Conflicts: activerecord/CHANGELOG.md
| * | | | Do not try to write timestamps if they are missing #8813Potapov Sergey2014-02-163-1/+29
| | | | |
* | | | | Make sure that fixtures are loaded before findingAkira Matsuda2014-08-141-0/+4
| | | | |
* | | | | FormatAkira Matsuda2014-08-141-2/+2
| | | | |
* | | | | ಠ_ಠ now that the commit sha is known I can add it to the relese guide.Yves Senn2014-08-141-0/+1
| | | | |
* | | | | remove deprecated `MissingHelperError` proxy.Yves Senn2014-08-143-3/+10
| | | | | | | | | | | | | | | | | | | | The error was moved outside of the `ClassMethods` module.
* | | | | Clear validators before and after each testAkira Matsuda2014-08-142-1/+2
| | | | | | | | | | | | | | | | | | | | Or some tests fail when run in random order
* | | | | Merge pull request #16027 from tgxworld/template_assertionsYves Senn2014-08-143-0/+36
|\ \ \ \ \ | | | | | | | | | | | | Fixes to ActionController::TemplateAssertions
| * | | | | Fix assert_template for files.Guo Xiang Tan2014-08-143-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was not failing for `assert_template file: nil` when a file has been rendered.
* | | | | | ask the scope object if it is a resource_method_scopeAaron Patterson2014-08-131-10/+13
| | | | | |
* | | | | | ask the scope for the action nameAaron Patterson2014-08-131-14/+18
| | | | | |
* | | | | | reduce calls to scope_levelAaron Patterson2014-08-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this will help us to encapsulate magical symbols so hopefully we can eliminate hardcoded magic symbols
* | | | | | change to attr_readerAaron Patterson2014-08-131-5/+1
| | | | | |
* | | | | | scope_level is no longer a hash key, just use the ivarAaron Patterson2014-08-131-4/+9
| | | | | |
* | | | | | move the scope level key fully inside the scope objectAaron Patterson2014-08-131-1/+5
| | | | | |
* | | | | | move scope_level to a method on the scope objectAaron Patterson2014-08-131-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | now we don't have to have a hard coded key
* | | | | | Finally! None of our tests are order_dependent!Akira Matsuda2014-08-141-5/+0
| | | | | |
* | | | | | only look up scope level onceAaron Patterson2014-08-131-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | avoid hash lookups and remove depency on the instance
* | | | | | only test `prefix` onceAaron Patterson2014-08-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | we don't need to repeat if statements
* | | | | | pass consistent parameters to canonical_action?Aaron Patterson2014-08-131-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now we only have to look up @scope[:scope_level] once per call to canonical_action? and we don't have a variable named "flag"
* | | | | | fewer operations on the options hashAaron Patterson2014-08-132-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we pass `as` down, then we won't have to do an insert / delete dance with the options hash
* | | | | | this should be accessing the hash, not calling a methodAaron Patterson2014-08-131-1/+1
| | | | | |
* | | | | | UnexpectedErrors may reference exceptions that can't be dumpedAaron Patterson2014-08-131-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnexpectedError exceptions wrap the original exception, and the original exception may contain a reference to something that can't be marshal dumped which will cause the process to die.
* | | | | | Merge pull request #16408 from aditya-kapoor/add-doc-ERB-escapeZachary Scott2014-08-131-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] add note about the ERB escape in generator docs
| * | | | | | [ci skip] add note about the ERB escape in generator docsAditya Kapoor2014-08-141-0/+15
| | | | | | |
* | | | | | | Merge pull request #16493 from aditya-kapoor/correct-cache-store-docSantiago Pastorino2014-08-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] correct default cache store class
| * | | | | | | [ci skip] correct default cache store classAditya Kapoor2014-08-131-1/+1
| | | | | | | |
* | | | | | | | Missing ActiveSupport require for calling String#firstAkira Matsuda2014-08-141-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | use :test delivery method for `base_test.rb`Yves Senn2014-08-132-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves errors like: ``` BaseTest#test_you_can_register_multiple_observers_to_the_mail_object_that_both_get_informed_on_email_delivery: Errno::ECONNREFUSED: Connection refused - connect(2) for "localhost" port 25 /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `initialize' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `open' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `tcp_socket' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:551:in `block in do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:91:in `block in timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `call' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:550:in `do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:520:in `start' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/network/delivery_methods/smtp.rb:112:in `deliver!' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:2136:in `do_delivery' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `block in deliver' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:528:in `block in deliver_mail' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `block in instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications/instrumenter.rb:20:in `instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `instrument' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:526:in `deliver_mail' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `deliver' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:598:in `block (2 levels) in <class:BaseTest>' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:801:in `mail_side_effects' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:593:in `block in <class:BaseTest>' ``` where the `:smtp` delivery method was leaked over to other test cases.
* | | | | | | actionmailer_tests_are_order_dependent!Akira Matsuda2014-08-131-0/+5
|/ / / / / /
* | | | | | Merge pull request #16491 from akshay-vishnoi/doc-changesYves Senn2014-08-134-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] fix spelling of overridden
| * | | | | | [ci skip] fix spelling of overrideAkshay Vishnoi2014-08-134-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Railties tests are order_independent! Hopefully.Akira Matsuda2014-08-131-4/+0
| | | | | |
* | | | | | Fix Railties tests that were order dependentAkira Matsuda2014-08-131-0/+10
| | | | | |
* | | | | | AS tests are now order_independent!Akira Matsuda2014-08-131-5/+0
| | | | | |