| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5334 from courtland/master | Jon Leighton | 2012-03-30 | 5 | -1/+27 |
| |\ | | | | | Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. | ||||
| | * | Tests for removing a HABTM association when optimistic locking is enabled. | Nick Rogers | 2012-03-07 | 4 | -1/+25 |
| | | | |||||
| | * | Fix deleting from a HABTM join table upon destroying an object of a model ↵ | Nick Rogers | 2012-03-07 | 1 | -0/+2 |
| | | | | | | | | | with optimistic locking enabled. Issue #5332. | ||||
| * | | Merge pull request #5668 from ↵ | José Valim | 2012-03-30 | 4 | -0/+32 |
| |\ \ | | | | | | | | | | | | | plashchynski/validate_attribute_name_in_class_and_module_attribute_accessors validate attribute names in class and module attribute accessors | ||||
| | * | | validate attribute names in class and module attribute accessors | Dmitry Plashchynski | 2012-03-30 | 4 | -0/+32 |
| | | | | |||||
| * | | | fix typo. thanks @nertzy | Jon Leighton | 2012-03-30 | 1 | -1/+1 |
| |/ / | |||||
| * | | Update guides to reflect 0a12a5f8169685915cbb7bf4d0a7bb482f7f2fd2 | Jon Leighton | 2012-03-30 | 1 | -20/+10 |
| | | | |||||
| * | | remove irrelevant references to ARel | Jon Leighton | 2012-03-30 | 1 | -2/+2 |
| | | | |||||
| * | | Add Relation#find_by and Relation#find_by! | Jon Leighton | 2012-03-30 | 6 | -0/+114 |
| | | | |||||
| * | | Merge pull request #2945 from Casecommons/nested_attributes_module | Jon Leighton | 2012-03-30 | 3 | -1/+15 |
| |\ \ | | | | | | | Nested attribute setters can be overridden. | ||||
| | * | | Nested attribute setters can be overridden. | Jonathan Mukai & Peter Jaros | 2012-03-28 | 3 | -1/+15 |
| | | | | | | | | | | | | | Overriding implementation can call super. | ||||
| * | | | recurse in read_attribute we get caching / don't duplicate code | Jon Leighton | 2012-03-30 | 1 | -3/+2 |
| | | | | |||||
| * | | | Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast | Aaron Patterson | 2012-03-29 | 3 | -5/+8 |
| |\ \ \ | | | | | | | | | Typecast 'id' attribute in read_attribute when using custom pks | ||||
| | * | | | Deprecate Column#type_cast_code | Carlos Antonio da Silva | 2012-03-29 | 2 | -4/+4 |
| | | | | | |||||
| | * | | | Properly typecast id attribute when using custom primary key | Carlos Antonio da Silva | 2012-03-29 | 1 | -1/+4 |
| |/ / / | |||||
| * | | | Merge pull request #5345 from guilleiguaran/ar-slice | Jeremy Kemper | 2012-03-29 | 3 | -0/+23 |
| |\ \ \ | | | | | | | | | post.slice(:title, :content) # => { title: "Hello", content: "World" } | ||||
| | * | | | CHANGELOG entry for AR#slice | Guillermo Iguaran | 2012-03-29 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Add ActiveRecord::Base#slice to slice method calls | Guillermo Iguaran | 2012-03-29 | 2 | -0/+18 |
| |/ / / | |||||
| * | | | Merge pull request #5617 from Empact/paths | Aaron Patterson | 2012-03-29 | 2 | -9/+1 |
| |\ \ \ | | | | | | | | | Spring cleaning in Rails::Paths | ||||
| | * | | | Define Paths::Root#[]= in terms of #add. | Ben Woosley | 2012-03-29 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Drop Paths::Root initializer check of #path as it isn't checked in the ↵ | Ben Woosley | 2012-03-29 | 2 | -5/+0 |
| | | | | | | | | | | | | | | | | | #path= or anywhere else | ||||
| | * | | | Drop unnecessary require in Rails::Paths | Ben Woosley | 2012-03-29 | 1 | -2/+0 |
| |/ / / | |||||
| * | | | Merge pull request #5625 from ↵ | José Valim | 2012-03-28 | 7 | -15/+88 |
| |\ \ \ | | | | | | | | | | | | | | | | | nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace | ||||
| | * | | | Make controller namespace partial prefix optional | Grant Hutchins | 2012-03-28 | 7 | -11/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController. | ||||
| | * | | | Test that render gets correct exact template name | Grant Hutchins | 2012-03-28 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helper | José Valim | 2012-03-28 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | Changing active model dirty module helper method to more appropriate met... | ||||
| | * | | | | Changing active model dirty module helper method to more appropriate method ↵ | Prasath Venkatraman | 2012-02-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with helper #4903 Changing active model dirty module helper method to more appropriate method with helper with Active Support Helper #4903 Changing active model dirty module helper method to more appropriate method with helper with Active Support Helper typo fixed #4903 | ||||
| * | | | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable | Santiago Pastorino | 2012-03-28 | 5 | -3/+30 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Missed commits from 3-2-stable | ||||
| | * | | | | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵ | Michael de Silva | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc. | ||||
| | * | | | | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-03-28 | 2 | -1/+13 |
| | | | | | | |||||
| | * | | | | Add a test case for layout nil. | José Valim | 2012-03-28 | 2 | -1/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #4843 from seamusabshere/patch-1 | Xavier Noria | 2012-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Possibly clearer way of getting rid of ` and " | ||||
| | * | | | | thanks to @jurriaan | Seamus Abshere | 2012-02-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Possibly clearer way of getting rid of ` and " | Seamus Abshere | 2012-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incidentally it's also faster... >> a = 'hello "id` world'; Benchmark.realtime { 500_000.times { a.tr('`"', "") } } => 0.7388770580291748 >> a = 'hello "id` world'; Benchmark.realtime { 500_000.times { a.gsub(/[`"]/, "") } } => 1.7843739986419678 | ||||
| * | | | | | Merge pull request #5643 from rafaelfranca/remove-duplication | Santiago Pastorino | 2012-03-28 | 3 | -44/+39 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove code duplication in InclusionValidator and ExclusionValidator. | ||||
| | * | | | | | Remove code duplication in InclusionValidator and ExclusionValidator. | Rafael Mendonça França | 2012-03-28 | 3 | -44/+39 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orginal code by @jamescook Closes #1352 [Rafael Mendonça França + James Cook] | ||||
| * / | | | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
| |/ / / / | | | | | | | | | | | | | Closes #5632 | ||||
| * | | | | Allow ActiveModel::Name to duck type | Piotr Sarnacki | 2012-03-28 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
| * | | | | config.action_view.embed_authenticity_token_in_remote_forms is true by default | Piotr Sarnacki | 2012-03-28 | 5 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms` to `false`. This change breaks remote forms that need to work also without javascript, so if you need such behavior, you can either set it to `true` or explicitly pass `:authenticity_token => true` in form options | ||||
| * | | | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 5 | -10/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | | much code can be deleted thanks to @tenderlove's refactoring | Jon Leighton | 2012-03-28 | 3 | -72/+6 |
| | | | | | |||||
| * | | | | Merge pull request #5630 from andhapp/fix-config-asset-manifest | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Changed the config.assets.manifest to nil | ||||
| | * | | | | Changed the config.assets.manifest to nil in the comments in the production ↵ | Anuj Dutta | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | config template. | ||||
| * | | | | | Add test for default_url_options[:port] | Aaron Suggs | 2012-03-28 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | Merge pull request #2528 from cesario/fix_2507 | José Valim | 2012-03-28 | 3 | -5/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | Rails.initialized? can be called at any time without raising an exception [Closes #2507] | ||||
| | * | | | | | Rails.initialized? can be called at any time without raising an exception ↵ | Franck Verrot | 2012-03-28 | 3 | -5/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Closes #2507] Changes: * `Rails.initialized=` has been removed * `Rails.initialized?` and `Rails.application.initialized?` are now * delegating to `MyApp::Application.initialized?` | ||||
| * | | | | | | Merge pull request #5623 from Houdini/master | José Valim | 2012-03-28 | 1 | -2/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Remove redundant variable from core_ext/hash/deep_dup.rb | ||||
| | * | | | | | remove redundant variable | Dmitrii Golub | 2012-03-28 | 1 | -2/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #5616 from cbartlett/migration-indent | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix indenting in migration generator | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |