Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge pull request #10942 from yangchenyun/mine | Yves Senn | 2013-06-16 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | correct documentation about active_record.default_timezone | |||||
| | * | | | | | | correct documentation about active_record behavior | Steven Yang | 2013-06-15 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Add CHANGELOG entry for #10969 | Rafael Mendonça França | 2013-06-16 | 1 | -0/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | Merge pull request #10969 from davidcelis/case-insensitive-asset-path | Rafael Mendonça França | 2013-06-16 | 2 | -3/+6 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Use a case insensitive URI Regexp for #asset_path | |||||
| | * | | | | | | Use a case insensitive URI Regexp for #asset_path | David Celis | 2013-06-16 | 2 | -3/+6 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context: https://gist.github.com/radar/5793814 The `URI_REGEXP` that various AssetUrl helpers use is currently case sensitive when checking for a URI scheme. This means if you try to pass a URL like `HTTP://www.example.com/path/to/image.jpg`, you end up with a bogus asset path: `/assets/HTTP://www.example.com/path/to/image.jpg`. URLs are case insensitive, so this regexp should be as well. Signed-off-by: David Celis <me@davidcel.is> | |||||
| * | | | | | | Merge pull request #10964 from nashby/collection-html-options | Rafael Mendonça França | 2013-06-16 | 3 | -1/+23 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | collection tags accept html attributes as the last element of collection | |||||
| | * | | | | | | collection tags accept html attributes as the last element of collection | Vasiliy Ermolovich | 2013-06-16 | 3 | -1/+23 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #10960 from pacoguzman/fix-build-due-to-10727 | Rafael Mendonça França | 2013-06-15 | 5 | -1/+6 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Fix build after #10727 | |||||
| | * | | | | | Rewind StringIO instances before be parsed again | Paco Guzman | 2013-06-16 | 5 | -0/+5 | |
| | | | | | | | ||||||
| | * | | | | | Use xml instead already parsed xml | Paco Guzman | 2013-06-16 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #10727 from pacoguzman/fix-xml-mini-tests | Rafael Mendonça França | 2013-06-15 | 6 | -6/+6 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix XmlMini different backends tests | |||||
| | * | | | | | Compare with the parsed result from REXML backend | Paco Guzman | 2013-05-22 | 6 | -6/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #10954 from arunagw/update_docs_for_const_regexp | Xavier Noria | 2013-06-15 | 1 | -1/+3 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updated the doc for const_regexp [ci skip] | |||||
| | * | | | | | | Updated the doc for const_regexp [ci skip] | Arun Agrawal | 2013-06-15 | 1 | -1/+3 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #10949 from alexpeattie/update_html_boolean_attrs | Rafael Mendonça França | 2013-06-15 | 3 | -4/+14 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update HTML boolean attributes per the HTML 5.1 spec | |||||
| | * | | | | | | Update the HTML boolean attributes per the HTML 5.1 spec | Alex Peattie | 2013-06-14 | 3 | -4/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add attributes `allowfullscreen`, `default`, `inert`, `sortable`, `truespeed`, `typemustmatch`. - Fix attribute `seamless` (previously misspelled `seemless`). - Use `assert_dom_equal` instead of `assert_equal` in test. | |||||
| * | | | | | | | Merge pull request #10533 from vipulnsward/fix_test | Rafael Mendonça França | 2013-06-15 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Fix test, addresss => address | |||||
| | * | | | | | | Make test name descriptive and add reference to original regression commit | Vipul A M | 2013-06-15 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #10907 from senny/fixtures_and_database_url | Yves Senn | 2013-06-15 | 3 | -4/+21 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fixture setup does not rely on `AR::Base.configurations`. | |||||
| | * | | | | | | | fixture setup does not rely on `AR::Base.configurations`. | Yves Senn | 2013-06-15 | 3 | -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_required | Rafael Mendonça França | 2013-06-15 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | 'json' gem is no more required under JRuby | |||||
| | * | | | | | | | 'json' gem is no more required under JRuby | Arun Agrawal | 2013-06-15 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #10925 from senny/10917_test_to_prevent_regression | Yves Senn | 2013-06-15 | 3 | -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 Senn | 2013-06-15 | 3 | -3/+36 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | cleanup, remove trailing whitespace from AR changelog | Yves Senn | 2013-06-15 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #10953 from acapilleri/fix_typos | Yves Senn | 2013-06-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | fix typos | |||||
| | * | | | | | | | fix typos | Angelo Capilleri | 2013-06-15 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix AS changelog [ci skip] | Carlos Antonio da Silva | 2013-06-14 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #10950 from appscape-forks/fix-wrong-method-name | Carlos Antonio da Silva | 2013-06-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix wrong method name | |||||
| | * | | | | | | | | valid_app_const? -> valid_const? | Martin Schürrer | 2013-06-15 | 1 | -1/+1 | |
| | | |_|/ / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #10946 from arunagw/build_fix_for_object_const_get_nil | Xavier Noria | 2013-06-14 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | We need to check exception name to be nil | |||||
| | * | | | | | | | Changing const_regexp to check for constant name. | Arun Agrawal | 2013-06-15 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to return Regexp.escape(camel_cased_word) if the split is blank. | |||||
| * | | | | | | | | Add CHANGELOG entry for #10740 | Rafael Mendonça França | 2013-06-14 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | Merge pull request #10740 from mrsimo/hash-with-indifferent-access-select | Rafael Mendonça França | 2013-06-14 | 2 | -0/+34 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | HashWithIndifferentAccess#select working as intended | |||||
| | * | | | | | | | | HashWithIndifferentAccess#select working as intended | Albert Llop | 2013-05-23 | 2 | -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_duplication | Rafael Mendonça França | 2013-06-14 | 1 | -11/+10 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Refactored ActiveRecord `first` method to get rid of duplication. | |||||
| | * | | | | | | | | | rename method `find_first_records` to `find_first_with_limit` | Dmitry Polushkin | 2013-06-10 | 1 | -3/+3 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Refactored ActiveRecord `first` method to get rid of duplication. | Dmitry Polushkin | 2013-06-09 | 1 | -11/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Properly namespace DatabaseTasks | Piotr Sarnacki | 2013-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use DatabaseTasks.env instead of Rails.env in databases.rake | Piotr Sarnacki | 2013-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #10937 from prathamesh-sonpatki/except_example | Yves Senn | 2013-06-14 | 1 | -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 except | Prathamesh Sonpatki | 2013-06-14 | 1 | -0/+8 | |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #10943 from killthekitten/10932_constantize_empty | Xavier Noria | 2013-06-14 | 2 | -5/+10 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | Fix #10932. Treat "" and "::" as invalid on constantize | |||||
| | * | | | | | | | | Fix #10932. Treat "" and "::" as invalid on constantize | Nikolay Shebanov | 2013-06-14 | 2 | -5/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #10833 from hone/remove_initialize_on_precompile | Guillermo Iguaran | 2013-06-13 | 4 | -35/+1 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | `initialize_on_precompile` is not used anymore. | |||||
| | * | | | | | | | | | `initialize_on_precompile` is not used anymore. | Terence Lee | 2013-06-13 | 4 | -35/+1 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | quoted table name is also cached | Aaron Patterson | 2013-06-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | table name is cached on the class, so stop caching twice | Aaron Patterson | 2013-06-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | calculate types on construction | Aaron Patterson | 2013-06-13 | 1 | -8/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | only cache the primary key column in one place | Aaron Patterson | 2013-06-13 | 1 | -1/+1 | |
| | | | | | | | | | |