aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | much code can be deleted thanks to @tenderlove's refactoringJon Leighton2012-03-283-72/+6
| | |
* | | Merge pull request #5630 from andhapp/fix-config-asset-manifestSantiago Pastorino2012-03-281-1/+1
|\ \ \ | | | | | | | | Changed the config.assets.manifest to nil
| * | | Changed the config.assets.manifest to nil in the comments in the production ↵Anuj Dutta2012-03-281-1/+1
| | | | | | | | | | | | | | | | config template.
* | | | Add test for default_url_options[:port]Aaron Suggs2012-03-281-0/+12
| | | |
* | | | Merge pull request #2528 from cesario/fix_2507José Valim2012-03-283-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 Verrot2012-03-283-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/masterJosé Valim2012-03-281-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Remove redundant variable from core_ext/hash/deep_dup.rb
| * | | | remove redundant variableDmitrii Golub2012-03-281-2/+1
| |/ / /
* | | | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-271-2/+2
|\ \ \ \ | | | | | | | | | | Fix indenting in migration generator
| * | | | Fix indenting in migration generatorColin Bartlett2012-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ rails generate migration remove_foo_from_bars foo:string This currently generates: def up remove_column :bars, :foo end Fix it: def up remove_column :bars, :foo end
* | | | | Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-272-3/+37
|\ \ \ \ \ | |_|/ / / |/| | | | Fix label_tag to merge the options hash with the object hash
| * | | | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-273-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5615
| * | | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc ↵Andrey Samsonov2012-03-272-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't call for label. objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | | | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-masterSantiago Pastorino2012-03-273-8/+12
|\ \ \ \ \ | | | | | | | | | | | | Don't break Haml with textarea newline fix. (master)
| * | | | | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
* | | | | | Remove Arel::Relation constant from PredicateBuilder.Juanjo Bazán2012-03-271-2/+2
| | | | | |
* | | | | | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-272-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | if you want to read the file you may need to ask if there is something to read from
* | | | | attributes are cached by string keys, so to_s to support symbols. fixes #5549Aaron Patterson2012-03-273-2/+17
| | | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-278-6/+69
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | minor edits in testing guide [ci skip]Vijay Dev2012-03-271-4/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:20:55 +0000