aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #6759 from dylanahsmith/only-catch-standard-errorSantiago Pastorino2012-06-175-8/+8
|\ \ \ \ | | | | | | | | | | Avoid unnecessary catching of Exception instead of StandardError.
| * | | | Avoid unnecessary catching of Exception instead of StandardError.Dylan Smith2012-06-175-8/+8
| | | | |
* | | | | Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-171-14/+14
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Fixing load config in some tasks
| * / / Adding `load_config` task as dependency.Cairo Noleto2012-06-161-14/+14
|/ / / | | | | | | | | | Without this, some tasks won't load configurations like custom engines.
* | | Merge pull request #6755 from kennyj/remove_csv_supportRafael Mendonça França2012-06-162-1/+13
|\ \ \ | | | | | | | | Don't read csv file during executing db:fixtures:load.
| * | | Don't read csv file during executing db:fixtures:load.kennyj2012-06-172-1/+13
|/ / /
* | | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|\ \ \ | | | | | | | | Respect absolute paths in compute_source_path.
| * | | Respect absolute paths in compute_source_path.Steve Klabnik2012-06-163-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using compute_source_path to determine the full path of an asset, if our source begins with '/', we don't want to include the directory. Examples are illustrative: > compute_source_path("foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/stylesheets/foo.css" > compute_source_path("/foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/foo.css" Before this patch, the second example would return the same as the first. Fixes #5680.
* | | | Merge pull request #6753 from schnittchen/patch-1José Valim2012-06-161-1/+1
|\ \ \ \ | | | | | | | | | | Documentation: "asynchronously" is misleading here
| * | | | Documentation: make it clearer that subscribers are not notified ↵Schnittchen2012-06-161-1/+1
|/ / / / | | | | | | | | | | | | asynchronously, but saved for later use.
* | | | Merge pull request #6748 from marcandre/dasherize_docRafael Mendonça França2012-06-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix doc example for dasherize
| * | | | Fix doc example for dasherizeMarc-Andre Lafortune2012-06-151-1/+1
|/ / / /
* | | | TestCase does not need to be loaded when loading the frameworkAaron Patterson2012-06-152-2/+13
| | | |
* | | | no need to define methods in included hookJon Leighton2012-06-151-13/+13
| | | |
* | | | Fix deprecation warnings when using ↵Jon Leighton2012-06-152-3/+40
| | | | | | | | | | | | | | | | config.active_record.mass_assignment_sanitizer=
* | | | Fix observers with AR::ModelJon Leighton2012-06-154-3/+27
| | | |
* | | | Fix config.active_record.whitelist_attributes with AR::ModelJon Leighton2012-06-154-6/+44
| | | |
* | | | Simplify AR configuration code.Jon Leighton2012-06-1531-567/+356
| | | | | | | | | | | | | | | | | | | | Get rid of ActiveModel::Configuration, make better use of ActiveSupport::Concern + class_attribute, etc.
* | | | refactorJon Leighton2012-06-151-11/+5
| | | |
* | | | Merge pull request #6646 from kennyj/fix_3470Carlos Antonio da Silva2012-06-157-3/+35
|\ \ \ \ | |/ / / |/| | | Support unicode character route directly in config/routes.rb. Fix #3470.
| * | | Support unicode character route in config/routes.rb.kennyj2012-06-167-3/+35
|/ / /
* | | Use status, content_type, body method signature for render tooSantiago Pastorino2012-06-141-4/+3
| | |
* | | Refactor public exceptions to reuse render format methodCarlos Antonio da Silva2012-06-141-9/+6
| |/ |/|
* | Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
| | | | | | | | | | | | | | Before 7f4b0a1231bf3c65db2ad4066da78c3da5ffb01, this test are asserting that update_attribute does the dirty tracking. Since we remove this method and update_column write in the database directly this tests will always fail>
* | Add CHANGELOG entry to the uuid datatype support to PostgreSQL adpterRafael Mendonça França2012-06-141-0/+2
| |
* | Merge pull request #6713 from etehtsea/activerecord-uuidRafael Mendonça França2012-06-146-10/+39
|\ \ | | | | | | | | | Add uuid datatype support to PostgreSQL adapter
| * | Add uuid type support to PostgreSQL adapterKonstantin Shabanov2012-06-146-10/+39
| | |
* | | registers the removal of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+6
| | |
* | | Merge pull request #6738 from steveklabnik/masterXavier Noria2012-06-147-87/+11
|\ \ \ | | | | | | | | Remove update_attribute.
| * | | Remove update_attribute.Steve Klabnik2012-06-147-87/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically, update_attribute and update_attributes are similar, but with one big difference: update_attribute does not run validations. These two methods are really easy to confuse given their similar names. Therefore, update_attribute is being removed in favor of update_column. See the thread on rails-core here: https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-core/BWPUTK7WvYA
* | | | adding a test for #6459Aaron Patterson2012-06-141-0/+10
| | | |
* | | | fix some formatting [ci skip]Vijay Dev2012-06-141-28/+38
| | | |
* | | | Revert "AV::TestCase does not need to be loaded when eagerly loading the"Aaron Patterson2012-06-141-2/+1
| | | | | | | | | | | | | | | | This reverts commit f5e7cb84cd377feb1b60c5356ce02123e9c94380.
* | | | modify middleware docs [ci skip]Vijay Dev2012-06-141-2/+2
| | | |
* | | | we raise a subclass of LoadError, so rescue thatAaron Patterson2012-06-141-1/+6
| | | |
* | | | Add docs about how to remove some middlewareSantiago Pastorino2012-06-141-0/+17
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-1416-766/+297
|\ \ \ \
| * | | | move the info about cosmetic changes to a diff location [ci skip]Vijay Dev2012-06-141-4/+2
| | | | |
| * | | | moar copy edits [ci skip]Vijay Dev2012-06-141-2/+1
| | | | |
| * | | | copy editing [ci skip]Vijay Dev2012-06-141-4/+7
| | | | |
| * | | | Revert "Add a note about JavaScript runtime"Vijay Dev2012-06-141-7/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit d63b69ba7f2b9111aeb04b50884949c2a4b6e584.
| * | | | Add server.run exampleOscar Del Ben2012-06-141-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | This is the last chapter before I go back and make sure the guide is complete/review
| * | | | Show how to add attributes to optionsNathan Long2012-06-131-0/+12
| | | | |
| * | | | Show when Rack middlewares are executedOscar Del Ben2012-06-131-0/+40
| | | | |
| * | | | Add initialize! explanationOscar Del Ben2012-06-131-0/+25
| | | | |
| * | | | Close explanation of config/environmentOscar Del Ben2012-06-131-0/+8
| | | | |
| * | | | Adding note about cosmetic changes not being acceptedAndrew Hooker2012-06-121-0/+4
| | | | |
| * | | | fixed http token authentication formattingJakub Kuźma2012-06-121-8/+13
| | | | |
| * | | | Fix cache_store configuration exampleSam Oliver2012-06-111-1/+1
| | | | |
| * | | | Range#cover? is not implemented in AS nowAkira Matsuda2012-06-122-4/+3
| | | | |