aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4911 from Floppy/masterAaron Patterson2012-03-302-1/+11
|\ | | | | Reduce FILENAME_MAX_SIZE in ActiveSupport::Cache::FileStore
| * Change FILENAME_MAX_SIZE in FileStore to 228.James Smith2012-02-062-1/+11
| | | | | | | | In order that temp filenames generated from it will fit in 255 chars. See https://github.com/rails/rails/issues/4907
* | Merge pull request #5673 from avakhov/ac-render-exceptionPiotr Sarnacki2012-03-301-3/+0
|\ \ | | | | | | Remove AC::RenderError class second declaration
| * | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
|/ /
* | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-302-2/+14
| |
* | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| |
* | clear up duplication between Persistence#destroy and Locking#destroyJon Leighton2012-03-302-27/+34
| |
* | fix testJon Leighton2012-03-301-1/+2
| |
* | whitespace :scissors:Jon Leighton2012-03-302-5/+4
| |
* | Merge pull request #5334 from courtland/masterJon Leighton2012-03-305-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 Rogers2012-03-074-1/+25
| | |
| * | Fix deleting from a HABTM join table upon destroying an object of a model ↵Nick Rogers2012-03-071-0/+2
| | | | | | | | | | | | with optimistic locking enabled. Issue #5332.
* | | Merge pull request #5668 from ↵José Valim2012-03-304-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 accessorsDmitry Plashchynski2012-03-304-0/+32
| | | |
* | | | fix typo. thanks @nertzyJon Leighton2012-03-301-1/+1
|/ / /
* | | Update guides to reflect 0a12a5f8169685915cbb7bf4d0a7bb482f7f2fd2Jon Leighton2012-03-301-20/+10
| | |
* | | remove irrelevant references to ARelJon Leighton2012-03-301-2/+2
| | |
* | | Add Relation#find_by and Relation#find_by!Jon Leighton2012-03-306-0/+114
| | |
* | | Merge pull request #2945 from Casecommons/nested_attributes_moduleJon Leighton2012-03-303-1/+15
|\ \ \ | | | | | | | | Nested attribute setters can be overridden.
| * | | Nested attribute setters can be overridden.Jonathan Mukai & Peter Jaros2012-03-283-1/+15
| | | | | | | | | | | | | | | | Overriding implementation can call super.
* | | | recurse in read_attribute we get caching / don't duplicate codeJon Leighton2012-03-301-3/+2
| | | |
* | | | Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecastAaron Patterson2012-03-293-5/+8
|\ \ \ \ | | | | | | | | | | Typecast 'id' attribute in read_attribute when using custom pks
| * | | | Deprecate Column#type_cast_codeCarlos Antonio da Silva2012-03-292-4/+4
| | | | |
| * | | | Properly typecast id attribute when using custom primary keyCarlos Antonio da Silva2012-03-291-1/+4
|/ / / /
* | | | Merge pull request #5345 from guilleiguaran/ar-sliceJeremy Kemper2012-03-293-0/+23
|\ \ \ \ | | | | | | | | | | post.slice(:title, :content) # => { title: "Hello", content: "World" }
| * | | | CHANGELOG entry for AR#sliceGuillermo Iguaran2012-03-291-0/+5
| | | | |
| * | | | Add ActiveRecord::Base#slice to slice method callsGuillermo Iguaran2012-03-292-0/+18
|/ / / /
* | | | Merge pull request #5617 from Empact/pathsAaron Patterson2012-03-292-9/+1
|\ \ \ \ | | | | | | | | | | Spring cleaning in Rails::Paths
| * | | | Define Paths::Root#[]= in terms of #add.Ben Woosley2012-03-291-2/+1
| | | | |
| * | | | Drop Paths::Root initializer check of #path as it isn't checked in the ↵Ben Woosley2012-03-292-5/+0
| | | | | | | | | | | | | | | | | | | | #path= or anywhere else
| * | | | Drop unnecessary require in Rails::PathsBen Woosley2012-03-291-2/+0
|/ / / /
* | | | Merge pull request #5625 from ↵José Valim2012-03-287-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 optionalGrant Hutchins2012-03-287-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 nameGrant Hutchins2012-03-281-4/+4
| | | | |
* | | | | Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helperJosé Valim2012-03-281-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 Venkatraman2012-02-061-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-stableSantiago Pastorino2012-03-285-3/+30
|\ \ \ \ \ | |_|/ / / |/| | | | Missed commits from 3-2-stable
| * | | | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵Michael de Silva2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
| * | | | datetime_select should work with -/+ infinity datesJoe Van Dyk2012-03-282-1/+13
| | | | |
| * | | | Add a test case for layout nil.José Valim2012-03-282-1/+16
| | | | |
* | | | | Merge pull request #4843 from seamusabshere/patch-1Xavier Noria2012-03-281-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Possibly clearer way of getting rid of ` and "
| * | | | thanks to @jurriaanSeamus Abshere2012-02-141-1/+1
| | | | |
| * | | | Possibly clearer way of getting rid of ` and " Seamus Abshere2012-02-011-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-duplicationSantiago Pastorino2012-03-283-44/+39
|\ \ \ \ \ | | | | | | | | | | | | Remove code duplication in InclusionValidator and ExclusionValidator.
| * | | | | Remove code duplication in InclusionValidator and ExclusionValidator.Rafael Mendonça França2012-03-283-44/+39
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orginal code by @jamescook Closes #1352 [Rafael Mendonça França + James Cook]
* / | | | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
|/ / / / | | | | | | | | | | | | Closes #5632
* | | | Allow ActiveModel::Name to duck typePiotr Sarnacki2012-03-281-4/+4
| | | |
* | | | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-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 defaultPiotr Sarnacki2012-03-285-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_formsPiotr Sarnacki2012-03-285-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 07:48:19 +0000