aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gist URLs are now namespacedAkira Matsuda2013-02-186-11/+11
| | | | see: https://github.com/blog/1406-namespaced-gists
* Merge pull request #9313 from bkzl/return-false-on-toggle-on-error-pagesGuillermo Iguaran2013-02-172-6/+7
|\ | | | | Return false in toggle function on error pages
| * Return false on toggle on error pagesBartlomiej Kozal2013-02-172-6/+7
| |
* | Merge pull request #9312 from Takehiro-Adachi/add_tests_for_ar_createGuillermo Iguaran2013-02-171-0/+8
|\ \ | |/ |/| Add test for ActiveRecord::Base#create
| * add tests for ActiveRecord::Base#createTakehiro Adachi2013-02-181-0/+8
|/
* Add CHANGELOG entry for 41ff6a10216f48f43605a1f9cd6094765cab750fAndrew White2013-02-171-0/+40
| | | | [ci skip]
* Merge pull request #9307 from wangjohn/remove_unneeded_md5_digestXavier Noria2013-02-161-1/+0
|\ | | | | Removed an old require of an MD5 digest which is no longer used.
| * Removed an old require of an MD5 digest which is no longer used.wangjohn2013-02-151-1/+0
| |
* | copy-edits RDoc in fba496fXavier Noria2013-02-161-4/+4
| | | | | | | | | | | | | | This revision makes the terminology uniform with the rest of the file. In general we describe these methods in terms of the adapter, rather than the database. (As a side note, if we wanted to refer to the database we would write "PostgreSQL".)
* | Remove valid_type? methodJon Leighton2013-02-154-17/+0
| | | | | | | | | | It was supposed to be removed by the preceding two reversions but I did them in the wrong order.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-1511-9/+68
|\ \ | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md
| * | copy edits [ci skip]Vijay Dev2013-02-152-3/+3
| | |
| * | Revert "incorrect content of models/comment.rb after 'rails generate'"Rafael Mendonça França2013-02-131-2/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 0f0803fda5df60319d8646bb4f3e71f2e596316a. Reason: The content was correct since attr_accessible was removed from rails master.
| * | incorrect content of models/comment.rb after 'rails generate'Kuba Brecka2013-02-131-0/+2
| | |
| * | Correct bullet content line wrappingTim "Roger" Harvey2013-02-121-1/+1
| | | | | | | | | | | | | | | | | | The `:prefix` bullet content was not properly wrapping, dropping to the following line because the additional content was not indented properly. With this change, it will now display properly the way `:discard_type` does.
| * | Detail Ruby 1.8 ships with TestUnit and Ruby 1.9 with MiniTestAmerico Savinon2013-02-121-1/+4
| | |
| * | Fix typo.Carson McDonald2013-02-111-1/+1
| | | | | | | | | | | | [ci skip]
| * | Fix supported ruby version for Rails 4Ryunosuke SATO2013-02-101-1/+1
| | |
| * | Fix CoffeeScript exampleRyunosuke SATO2013-02-101-1/+1
| | | | | | | | | | | | `a[data-color]` is not used in example html.
| * | Clarify ActiveModel::Validator initialization in docs.Henrik Nyh2013-02-091-0/+3
| | | | | | | | | As discussed with @josevalim on Ruby Rogues Parley.
| * | Validations guide: validates_with init clarification.Henrik Nyh2013-02-091-0/+29
| | | | | | | | | As discussed with @josevalim on Ruby Rogues Parley.
| * | Add example for ActiveRecord::Base.joins using a string as argumentMaurizio De Santis2013-02-071-0/+5
| | |
| * | Add example for ActiveRecord::Base.group using a string as argumentMaurizio De Santis2013-02-071-0/+3
| | |
| * | Add documentation for ActiveRecord.select when use strings as argumentsMaurizio De Santis2013-02-071-0/+10
| | |
| * | Add ActiveRecord.count documentation when used on group relationsMaurizio De Santis2013-02-071-0/+6
| | |
| * | Change Class#subclasses doc exampleDalibor Nasevic2013-02-061-2/+2
| | |
| * | Fixing the examples for button_toMarc Baumbach2013-02-061-2/+2
| | | | | | | | | The examples do not generate the output they intend to due to not explicitly declaring the hash separations. This causes it to be treated as one parameter instead of the intended two parameters.
| * | Fix file name in document [ci skip]Ryunosuke SATO2013-02-051-1/+1
| | | | | | | | | | | | This file was renamed in c8a25386d.
* | | Revert "Make valid_type? public"Jon Leighton2013-02-154-12/+17
| | | | | | | | | | | | | | | | | | This reverts commit 5d528f835e871f5f9d4b68e8a81cfbe900b7e718. Relates to f8c8ad5 which is also getting reverted due to failing test.
* | | Revert "checking in the abstractions for valid type checking:"Jon Leighton2013-02-154-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c321b309a9a90bbfa0912832c11b3fef52e71840. Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column'
* | | Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_define_method""Jon Leighton2013-02-151-18/+13
| | | | | | | | | | | | | | | | | | This reverts commit 8aa4603a5adaa56c818a7bd1c0b761b4ecca3d3e. Reverting the revert because I reverted the wrong thing! Fail.
* | | Revert "Merge pull request #9206 from ranjaykrishna/use_define_method"Jon Leighton2013-02-151-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1fc6876b57f2e1d31731e74eb4271b5655e746d2, reversing changes made to 0268b5d8cdc3c5a1337462135f0a326a2654ba1a. Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column'
* | | Merge pull request #9298 from wangjohn/add_documentation_to_migration_collisionJeremy Kemper2013-02-151-1/+1
|\ \ \ | |_|/ |/| | Added extra comment when a migration already exists of the same name
| * | Added extra comment when a migration already exists of the same name.wangjohn2013-02-151-1/+1
|/ / | | | | | | | | | | User should know that he can overwrite the previous migration. This comes in handy especially when generating models which were previously created then removed.
* | Merge pull request #8704 from senny/remove_regexp_global_from_url_forAaron Patterson2013-02-142-2/+9
|\ \ | | | | | | replace regexp global in #url_for
| * | replace regexp global in #url_forYves Senn2013-01-162-2/+9
| | |
* | | Merge pull request #9252 from senny/8423_hmt_preloading_bugRafael Mendonça França2013-02-143-1/+30
|\ \ \ | | | | | | | | don't cache invalid subsets when preloading hmt associations
| * | | don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-143-1/+30
| | | | | | | | | | | | | | | | closes #8423.
* | | | Merge pull request #9285 from rahul100885/masterGuillermo Iguaran2013-02-141-1/+1
|\ \ \ \ | | | | | | | | | | Bump rack-test dependency to 0.6.2
| * | | | Bump rack-test dependency to 0.6.2Rahul P. Chaudhari2013-02-141-1/+1
| |/ / /
* | | | Merge pull request #9283 from rubys/masterCarlos Antonio da Silva2013-02-144-17/+12
|\ \ \ \ | |/ / / |/| | | Make valid_type? public
| * | | Make valid_type? publicSam Ruby2013-02-144-17/+12
|/ / /
* | | Merge pull request #9254 from warnickr/9253_avoid_bigdecimal_performance_issueCarlos Antonio da Silva2013-02-131-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before writing a numeric attribute value, ActiveRecord does an implicit conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false. This is known to be very slow in Ruby 1.9.3 (see http://www.ruby-forum.com/topic/4409452 and https://bugs.ruby-lang.org/issues/7645#change-35188). The Ruby core team has implemented a fix for this issue that will be included in Ruby 2, but they appear to have no intention of back-porting this fix to Ruby 1.9.3. In my case, the performance impact of this issue was enormous (200% - 300% performance hit) for some of the pages in my application. See c75b5a88a82c79fdf95dfea4d72bf3c5a829930e applied to 3-2-stable branch for more reasoning and a benchmark.
| * | | 9253: Before writing a numeric attribute value, ActiveRecord does an implicitRyan Warnick2013-02-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false. This is known to be very slow in Ruby 1.9.3.
* | | | Merge pull request #9115 from bensie/issue_5802Steve Klabnik2013-02-133-1/+36
|\ \ \ \ | | | | | | | | | | Don't call after_commit when creating through an association and save fails, fixes #5802
| * | | | Don't call after_commit when creating through an association and save fails, ↵James Miller2013-02-133-1/+36
|/ / / / | | | | | | | | | | | | fixes #5802
* / / / Avoid to_sym callsSantiago Pastorino2013-02-131-1/+1
|/ / /
* | | Merge pull request #9204 from ranjaykrishna/col-probAaron Patterson2013-02-128-1/+43
|\ \ \ | | | | | | | | schema dumper tests now conducted by ActiveRecord::Base.Connection
| * | | checking in the abstractions for valid type checking:Ranjay Krishna2013-02-128-1/+43
| | | |
* | | | Merge pull request #9206 from ranjaykrishna/use_define_methodCarlos Antonio da Silva2013-02-121-18/+13
|\ \ \ \ | | | | | | | | | | Use define method instead of class_eval