aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* `CollectionProxy#include?` returns `true` and `false` as documented.Yves Senn2013-06-182-12/+12
|
* Merge pull request #10907 from senny/fixtures_and_database_urlYves Senn2013-06-153-4/+21
|\ | | | | fixture setup does not rely on `AR::Base.configurations`.
| * fixture setup does not rely on `AR::Base.configurations`.Yves Senn2013-06-153-4/+21
|/ | | | | | | | As you can also configure your database connection using `ENV["DATABASE_URL"]`, the fixture setup can't reply on the `.configurations` Hash. As the fixtures are only loaded when ActiveRecord is actually used (`rails/test_help.rb`) it should be safe to drop the check for an existing configuration.
* Merge pull request #10955 from arunagw/jruby_json_not_requiredRafael Mendonça França2013-06-151-1/+0
|\ | | | | 'json' gem is no more required under JRuby
| * 'json' gem is no more required under JRubyArun Agrawal2013-06-151-1/+0
| |
* | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-153-3/+36
|\ \ | | | | | | regression test + mysql2 adapter raises correct error if conn is closed.
| * | regression test + mysql2 adapter raises correct error if conn is closed.Yves Senn2013-06-153-3/+36
|/ /
* | cleanup, remove trailing whitespace from AR changelogYves Senn2013-06-151-4/+4
| |
* | Merge pull request #10953 from acapilleri/fix_typosYves Senn2013-06-151-1/+1
|\ \ | |/ |/| fix typos
| * fix typosAngelo Capilleri2013-06-151-1/+1
| |
* | Fix AS changelog [ci skip]Carlos Antonio da Silva2013-06-141-1/+1
| |
* | Merge pull request #10950 from appscape-forks/fix-wrong-method-nameCarlos Antonio da Silva2013-06-141-1/+1
|\ \ | | | | | | Fix wrong method name
| * | valid_app_const? -> valid_const?Martin Schürrer2013-06-151-1/+1
| | |
* | | Merge pull request #10946 from arunagw/build_fix_for_object_const_get_nilXavier Noria2013-06-141-0/+3
|\ \ \ | |/ / |/| | We need to check exception name to be nil
| * | Changing const_regexp to check for constant name.Arun Agrawal2013-06-151-0/+3
| | | | | | | | | | | | We need to return Regexp.escape(camel_cased_word) if the split is blank.
* | | Add CHANGELOG entry for #10740Rafael Mendonça França2013-06-141-0/+9
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #10740 from mrsimo/hash-with-indifferent-access-selectRafael Mendonça França2013-06-142-0/+34
|\ \ \ | | | | | | | | HashWithIndifferentAccess#select working as intended
| * | | HashWithIndifferentAccess#select working as intendedAlbert Llop2013-05-232-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | Before this commit, #reject returned a HashWithIndifferentAccess, whereas #select returned a Hash. Now #select also returns a HashWithIndifferentAccess.
* | | | Merge pull request #10898 from dmitry/find_first_refactor_duplicationRafael Mendonça França2013-06-141-11/+10
|\ \ \ \ | | | | | | | | | | Refactored ActiveRecord `first` method to get rid of duplication.
| * | | | rename method `find_first_records` to `find_first_with_limit`Dmitry Polushkin2013-06-101-3/+3
| | | | |
| * | | | Refactored ActiveRecord `first` method to get rid of duplication.Dmitry Polushkin2013-06-091-11/+10
| | | | |
* | | | | Properly namespace DatabaseTasksPiotr Sarnacki2013-06-141-1/+1
| | | | |
* | | | | Use DatabaseTasks.env instead of Rails.env in databases.rakePiotr Sarnacki2013-06-141-1/+1
| | | | |
* | | | | Merge pull request #10937 from prathamesh-sonpatki/except_exampleYves Senn2013-06-141-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Added an example of the query without except before the example with except
| * | | | Added an example of the query without except before the example with exceptPrathamesh Sonpatki2013-06-141-0/+8
| | | | |
* | | | | Merge pull request #10943 from killthekitten/10932_constantize_emptyXavier Noria2013-06-142-5/+10
|\ \ \ \ \ | |/ / / / |/| | | | Fix #10932. Treat "" and "::" as invalid on constantize
| * | | | Fix #10932. Treat "" and "::" as invalid on constantizeNikolay Shebanov2013-06-142-5/+10
| | | | |
* | | | | Merge pull request #10833 from hone/remove_initialize_on_precompileGuillermo Iguaran2013-06-134-35/+1
|\ \ \ \ \ | | | | | | | | | | | | `initialize_on_precompile` is not used anymore.
| * | | | | `initialize_on_precompile` is not used anymore.Terence Lee2013-06-134-35/+1
|/ / / / /
* | | | | quoted table name is also cachedAaron Patterson2013-06-131-1/+1
| | | | |
* | | | | table name is cached on the class, so stop caching twiceAaron Patterson2013-06-131-1/+1
| | | | |
* | | | | calculate types on constructionAaron Patterson2013-06-131-8/+4
| | | | |
* | | | | only cache the primary key column in one placeAaron Patterson2013-06-131-1/+1
| | | | |
* | | | | these methods are never called, so remove themAaron Patterson2013-06-131-8/+0
| | | | |
* | | | | This test does not test anything that happens in the real world. If youAaron Patterson2013-06-132-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recreate the models without mucking with internal caches of the relation objects, then the test fails. For example: class Man < ActiveRecord::Base has_many :interests end class Interest < ActiveRecord::Base belongs_to :man end Then do this test: def test_validate_presence_of_parent_fails_without_inverse_of repair_validations(Interest) do Interest.validates_presence_of(:man) assert_no_difference ['Man.count', 'Interest.count'] do man = Man.create(:name => 'John', :interests_attributes => [{:topic=>'Cars'}, {:topic=>'Sports'}]) assert_not_predicate man.errors[:"interests.man"], :empty? end end end The test will fail. This is a bad test, so I am removing it.
* | | | | Don't set X-UA-Compatible header by defaultGuillermo Iguaran2013-06-132-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are setting this header to chrome=1 for Chrome Frame and this will be retired soon. Check http://blog.chromium.org/2013/06/retiring-chrome-frame.html for details
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-06-1458-169/+332
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md
| * | | | | copy editing AS guide [ci skip]Vijay Dev2013-06-141-19/+4
| | | | | |
| * | | | | copy edits [ci skip]Vijay Dev2013-06-144-34/+27
| | | | | |
| * | | | | Revert "Add detailed steps on how to squash multiple commits into a single ↵Vijay Dev2013-06-141-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detailed commit" This reverts commit 6df9c595ad8e473d15a81a9291e891476bc833c2.
| * | | | | Revert "Whitespace trimming in guides generation"Vijay Dev2013-06-144-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 91a1cf7013252753567b36f61bfcd5fd0a5bb2b8. Reason: code changes disallowed in docrails, even if they are guides generation related.
| * | | | | Using 1.9 syntax for edge guidesRashmi Yadav2013-06-121-2/+2
| | | | | |
| * | | | | minor doc changes to `ActiveSupport::BacktraceCleaner`.Yves Senn2013-06-121-5/+5
| | | | | |
| * | | | | Image optimized for web viewRashmi Yadav2013-06-0923-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Used imageoptim, Saved few bytes http://imageoptim.com/
| * | | | | Merge branch 'master' of github.com:rails/docrailsJeff Cohen2013-06-081-1/+48
| |\ \ \ \ \
| | * | | | | doc: renaming table name to follow the file's standardsThiago Pinto2013-06-081-2/+2
| | | | | | |
| | * | | | | instructions for variations and alternatives for ActiveRecord#findThiago Pinto2013-06-081-1/+35
| | | | | | |
| | * | | | | Merge branch 'master' of github.com:rails/docrailsThiago Pinto2013-06-081-0/+6
| | |\ \ \ \ \
| | * | | | | | explaining ActiveRecord#first in rails 3 and 4Thiago Pinto2013-06-081-0/+13
| | | | | | | |
| * | | | | | | Describe ActiveSupport core extensions for BigDecimal, JSON support, and ↵Jeff Cohen2013-06-081-1/+65
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | instance variable names.