aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | add missing do [ci skip]Vijay Dev2012-03-271-1/+1
| | |
| * | Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide"Vijay Dev2012-03-271-16/+6
| | | | | | | | | | | | | | | | | | | | | This reverts commit 7feec40b89ada892ca6f107ada27ceedde505d83. Reason: The guide had the contents of railties/bin/rails and I don't see any reason to change it.
| * | Proc objects for caches_page no need controller objectAlexey Vakhov2012-03-271-1/+1
| | |
| * | added shallow_prefix option description in documantationLukasz Sarnacki2012-03-271-0/+19
| | | | | | | | | | | | It is in response for confusion in issue #5301
| * | Missing generated query for pluck method. Juanjo Bazán2012-03-271-1/+1
| | | | | | | | | (and changed the use of true for a more database agnostic example).
| * | Made it a bit more clear where to run rails/serverDimitri De Frenne2012-03-261-1/+1
| | |
| * | Fixed typo in pathDimitri De Frenne2012-03-261-1/+1
| | |
| * | document `-e` argument for rails consoleschneems2012-03-241-0/+6
| | | | | | | | | | | | | | | this adds documentation for -e flag which sets the environment of the rails console like the `rails server` command.
| * | Testing layout gotcha when view renders partialPanayotis Matsinopoulos2012-03-241-0/+16
| | |
| * | Small layout correctionPanayotis Matsinopoulos2012-03-241-2/+1
| | |
| * | Testing Template and Layout ExamplePanayotis Matsinopoulos2012-03-241-0/+25
| | |
| * | Use one 'be'.Waseem Ahmad2012-03-241-1/+1
| | |
| * | Fix AC actions caching commentAlexey Vakhov2012-03-241-1/+1
| | |
| * | [ci skip] updated bin/rails code in Rails Initialization Process guideSenthil A2012-03-241-6/+16
| | |
* | | Merge pull request #5499 from arunagw/remove_unused_codeSantiago Pastorino2012-03-271-2/+2
|\ \ \ | |_|/ |/| | removed unused variables
| * | removed unused variablesArun Agrawal2012-03-271-2/+2
| | |
* | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header.
* | | Merge pull request #5609 from tjmcewan/masterJosé Valim2012-03-272-0/+2
|\ \ \ | |/ / |/| | prevent returning a negative zero from number_with_precision
| * | change number_with_precision to not return negative zerosTim McEwan2012-03-272-0/+2
|/ /
* | Merge pull request #5582 from chendo/masterXavier Noria2012-03-261-1/+1
|\ \ | | | | | | Remove "needless boolean casting"
| * | Remove 'needless boolean casting'.Jack Chen (chendo)2012-03-261-1/+1
| | | | | | | | | | | | | | | "Predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsoever." - @fxn
* | | favor composition over inheritanceAaron Patterson2012-03-261-5/+20
| | |
* | | Don't ignore non Enumerable values passed to sanitize (closes #5585)Piotr Sarnacki2012-03-272-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed.
* | | favor composition over inheritanceAaron Patterson2012-03-262-8/+30
| | |
* | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|\ \ \ | | | | | | | | Issue with schema dump
| * | | Not checking for nil is apparently a lot faster.Nat Welch2011-09-211-1/+1
| | | |
| * | | Merge branch 'master' of git://github.com/rails/railsNat Welch2011-09-21349-3121/+6229
| |\ \ \
| * | | | From @dasch's recommendation.Nat Welch2011-08-221-1/+1
| | | | |
| * | | | Fixes bug with schema dumper when using with Padrino.Nat Welch2011-08-211-1/+1
| | | | |
* | | | | Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hashAaron Patterson2012-03-262-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Cookie store session hash
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 08:10:06 +0000