Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16523 from tomkadwill/cookie_store_rewording | Rafael Mendonça França | 2014-08-16 | 1 | -3/+3 |
|\ | | | | | [ci skip] re-worded section on CookieStore to make it more readable. | ||||
| * | [ci skip] re-worded section on CookieStore to make it more readable. | Tom Kadwill | 2014-08-16 | 1 | -3/+3 |
|/ | |||||
* | Avoid mutating the constants in a test case | Akira Matsuda | 2014-08-16 | 2 | -6/+4 |
| | |||||
* | Avoid polluting String class globally in a test case | Akira Matsuda | 2014-08-16 | 1 | -8/+13 |
| | |||||
* | Unused ivar in a test suite | Akira Matsuda | 2014-08-16 | 1 | -1/+0 |
| | |||||
* | Merge pull request #16435 from ↵ | Godfrey Chan | 2014-08-15 | 4 | -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 Neves | 2014-08-15 | 3 | -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 TransactionManager | Arthur Neves | 2014-08-15 | 2 | -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ça | 2014-08-15 | 1 | -1/+1 |
| | | | | The rails repository is not the official plugin anymore | ||||
* | Fixed link for in_place_editor [ci skip] | Arun Agrawal | 2014-08-15 | 1 | -1/+1 |
| | | | | closes #16512 | ||||
* | fix typo in method name (broken build :sweat:) | Yves Senn | 2014-08-15 | 1 | -1/+1 |
| | |||||
* | prefer `has_attribute?` over `attributes.key?`. | Yves Senn | 2014-08-15 | 1 | -1/+1 |
| | | | | Follow up to the discussion on #16505. | ||||
* | Merge pull request #16505 from sgrif/sg-attribute-internals | Yves Senn | 2014-08-15 | 1 | -2/+3 |
|\ | | | | | Use the method for determining attribute methods rather than duplicating | ||||
| * | Use the method for determining attribute methods rather than duplicating | Sean Griffin | 2014-08-15 | 1 | -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 Matsuda | 2014-08-15 | 1 | -0/+4 |
| | | |||||
* | | s/Dont'/Don't/ | Akira Matsuda | 2014-08-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16508 from jbsmith86/master | Sean Griffin | 2014-08-14 | 3 | -4/+4 |
|\ \ | |/ |/| | Spelling errors | ||||
| * | Spelling errors | jbsmith86 | 2014-08-14 | 3 | -4/+4 |
|/ | |||||
* | Merge pull request #16504 from schneems/schneems/fix_url_for | Aaron Patterson | 2014-08-14 | 1 | -1/+3 |
|\ | | | | | Perf optimization for `url_for` called w/ Hash | ||||
| * | Perf optimization for `url_for` called w/ Hash | schneems | 2014-08-14 | 1 | -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 queries | Akira Matsuda | 2014-08-15 | 1 | -1/+1 |
| | | |||||
* | | extract methods and metaprogram less. | Aaron Patterson | 2014-08-14 | 1 | -11/+16 |
| | | |||||
* | | Be sure to reset PK name renamed in the test | Akira Matsuda | 2014-08-15 | 1 | -0/+3 |
| | | |||||
* | | Use string for order argument, fixed from #16501 [ci skip] | Zachary Scott | 2014-08-14 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16501 from tomkadwill/update_delete_to_new_style | Zachary Scott | 2014-08-14 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] updated 'where' in association documention to new style syntax | ||||
| * | | [ci skip] updated 'where' in association documention to new style syntax | Tom Kadwill | 2014-08-14 | 1 | -1/+1 |
| | | | |||||
* | | | Warm up Symbols with where method | Akira Matsuda | 2014-08-15 | 1 | -1/+1 |
| |/ |/| | | | | | Looks like #first wasn't warm enough... | ||||
* | | Merge pull request #16502 from bogdan/where-hash-nested-relation | Santiago Pastorino | 2014-08-14 | 2 | -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 Relation | Bogdan Gusiev | 2014-08-14 | 2 | -3/+24 |
| | | | | | | | | | | | | | | | | | | Example: Author.where(posts: { author_id: Author.where(country_id: 1) }).joins(:posts) | ||||
* | | | Merge pull request #16438 from agrobbin/input-placeholder-i18n | Jeremy Kemper | 2014-08-14 | 5 | -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 fields | Alex Robbin | 2014-08-12 | 5 | -0/+214 |
| | | | | |||||
* | | | | Ignore SCHEMA queries in some habtm tests | Akira Matsuda | 2014-08-14 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #8813 from ↵ | Yves Senn | 2014-08-14 | 3 | -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 #8813 | Potapov Sergey | 2014-02-16 | 3 | -1/+29 |
| | | | | | |||||
* | | | | | Make sure that fixtures are loaded before finding | Akira Matsuda | 2014-08-14 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Format | Akira Matsuda | 2014-08-14 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | ಠ_ಠ now that the commit sha is known I can add it to the relese guide. | Yves Senn | 2014-08-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | remove deprecated `MissingHelperError` proxy. | Yves Senn | 2014-08-14 | 3 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | The error was moved outside of the `ClassMethods` module. | ||||
* | | | | | Clear validators before and after each test | Akira Matsuda | 2014-08-14 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Or some tests fail when run in random order | ||||
* | | | | | Merge pull request #16027 from tgxworld/template_assertions | Yves Senn | 2014-08-14 | 3 | -0/+36 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixes to ActionController::TemplateAssertions | ||||
| * | | | | | Fix assert_template for files. | Guo Xiang Tan | 2014-08-14 | 3 | -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_scope | Aaron Patterson | 2014-08-13 | 1 | -10/+13 |
| | | | | | | |||||
* | | | | | | ask the scope for the action name | Aaron Patterson | 2014-08-13 | 1 | -14/+18 |
| | | | | | | |||||
* | | | | | | reduce calls to scope_level | Aaron Patterson | 2014-08-13 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this will help us to encapsulate magical symbols so hopefully we can eliminate hardcoded magic symbols | ||||
* | | | | | | change to attr_reader | Aaron Patterson | 2014-08-13 | 1 | -5/+1 |
| | | | | | | |||||
* | | | | | | scope_level is no longer a hash key, just use the ivar | Aaron Patterson | 2014-08-13 | 1 | -4/+9 |
| | | | | | | |||||
* | | | | | | move the scope level key fully inside the scope object | Aaron Patterson | 2014-08-13 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | move scope_level to a method on the scope object | Aaron Patterson | 2014-08-13 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | now we don't have to have a hard coded key | ||||
* | | | | | | Finally! None of our tests are order_dependent! | Akira Matsuda | 2014-08-14 | 1 | -5/+0 |
| | | | | | | |||||
* | | | | | | only look up scope level once | Aaron Patterson | 2014-08-13 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | avoid hash lookups and remove depency on the instance |