aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16338 from robin850/rbx-safe-constantizeMatthew Draper2014-08-181-2/+2
|\ | | | | Avoid relying on error messages when rescuing
| * Avoid relying on error messages when rescuingRobin Dupret2014-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are rescuing from an error, it's a brittle approach to do checks with regular expressions on the raised message because it may change in in the future and error messages are different across implementations. The NameError API could be improved at the MRI level but for now we need to rely on its #name. A #== check will only pass for top level constants or only when the last constant of the path is missing so we need to rely on #include? instead. For instance: begin Namespace::Foo rescue NameError => e e.name # => :Namespace end However, if the name-space already exists, only the name of the first missing constant in the path is returned (e.g. for Math::PHI, the name would be :PHI). JRuby will return a fully qualified name (:"Math::PHI"). We need to keep the == check for 1.9 compatibility since const_get will raise a NameError with a name attribute set to the given string if it's one of "::" or "". See http://git.io/jnSN7g for further information.
* | Merge pull request #16527 from jeremy/etag_with_template_digestJeremy Kemper2014-08-177-9/+136
|\ \ | | | | | | When your templates change, browser caches bust automatically.
| * | When your templates change, browser caches bust automatically.Jeremy Kemper2014-08-177-9/+136
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New default: the template digest is automatically included in your ETags. When you call `fresh_when @post`, the digest for `posts/show.html.erb` is mixed in so future changes to the HTML will blow HTTP caches for you. This makes it easy to HTTP-cache many more of your actions. If you render a different template, you can now pass the `:template` option to include its digest instead: fresh_when @post, template: 'widgets/show' Pass `template: false` to skip the lookup. To turn this off entirely, set: config.action_controller.etag_with_template_digest = false
* | Merge pull request #16189 from sgrif/sg-attribute-was-in-placeGodfrey Chan2014-08-169-20/+67
|\ \ | | | | | | | | | Implement `_was` and `changes` for in-place mutations of AR attributes
| * | Don't expose these new APIs yet (added in 877ea78 / #16189)Godfrey Chan2014-08-163-15/+21
| | | | | | | | | | | | | | | | | | | | | WARNING: don't use them! They might change or go away between future beta/RC/ patch releases! Also added a CHANGELOG entry for this.
| * | Implement `_was` and `changes` for in-place mutations of AR attributesSean Griffin2014-08-168-21/+62
|/ /
* | Merge pull request #16517 from sgrif/sg-comparable-attributesRafael Mendonça França2014-08-164-0/+50
|\ \ | | | | | | Implement `==` on `Type::Value` and `Attribute`
| * | Implement `==` on `Type::Value` and `Attribute`Sean Griffin2014-08-154-0/+50
| | | | | | | | | | | | | | | This was a small self contained piece of the refactoring that I am working on, which required these objects to be comparable.
* | | Merge pull request #16523 from tomkadwill/cookie_store_rewordingRafael Mendonça França2014-08-161-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 Kadwill2014-08-161-3/+3
|/ / /
* | | Avoid mutating the constants in a test caseAkira Matsuda2014-08-162-6/+4
| | |
* | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 18:24:09 +0000