aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Avoid polluting String class globally in a test caseAkira Matsuda2014-08-161-8/+13
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Unused ivar in a test suiteAkira Matsuda2014-08-161-1/+0
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #16435 from ↵Godfrey Chan2014-08-154-4/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arthurnn/after_commit_run_on_top_level_trans_master Fix regression on after_commit in nested transactions. (master)
| * | | | | | | | | | | | | | | | | | Fix regression on after_commit in nested transactions.Arthur Neves2014-08-153-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after_commit should not run in nested transactions, however they should run once the outermost transaction gets committed. This patch fixes the problem copying the records from the Savepoint to its parent. So the RealTransaction will have all records that needs to run callbacks on it. [fixes #16425]
| * | | | | | | | | | | | | | | | | | Use *_transaction methods in TransactionManagerArthur Neves2014-08-152-4/+26
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `commit_transaction`/`rollback_transaction` on `within_new_transaction` method, so they make sure they `pop` the transaction from the stack before calling the methods `commit`/`rollback`.
* | | | | | | | | | | | | | | | | | Point to rubygems instead of Rails GitHub. [ci skip]Rafael Mendonça França2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rails repository is not the official plugin anymore
* | | | | | | | | | | | | | | | | | Fixed link for in_place_editor [ci skip]Arun Agrawal2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #16512
* | | | | | | | | | | | | | | | | | fix typo in method name (broken build :sweat:)Yves Senn2014-08-151-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | prefer `has_attribute?` over `attributes.key?`.Yves Senn2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to the discussion on #16505.
* | | | | | | | | | | | | | | | | | Merge pull request #16505 from sgrif/sg-attribute-internalsYves Senn2014-08-151-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the method for determining attribute methods rather than duplicating
| * | | | | | | | | | | | | | | | | | Use the method for determining attribute methods rather than duplicatingSean Griffin2014-08-151-2/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've been trying to reduce the number of places that care about `attributes`, and its existence. We have a method for this check, let's use it instead.
* | | | | | | | | | | | | | | | | | create_table + transactional_fixtures = :bomb:Akira Matsuda2014-08-151-0/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | s/Dont'/Don't/Akira Matsuda2014-08-151-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #16508 from jbsmith86/masterSean Griffin2014-08-143-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Spelling errors
| * | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 07:41:39 +0000