Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16950 from akshay-vishnoi/docs-rails-4point2 | Abdelkader Boudih | 2014-09-17 | 1 | -4/+4 |
|\ | | | | | Grammar correction in ActiveSupport CHANGELOG [ci skip] | ||||
| * | Grammar correction in ActiveSupport CHANGELOG [ci skip] | Akshay Vishnoi | 2014-09-18 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #16948 from akshay-vishnoi/docs-rails-4point2 | Rafael Mendonça França | 2014-09-17 | 2 | -20/+21 |
|\| | | | | | [ci skip] ActiveSupport CHANGELOG fixes | ||||
| * | [ci skip] ActiveSupport CHANGELOG fixes | Akshay Vishnoi | 2014-09-18 | 2 | -20/+21 |
| | | | | | | | | | | | | | | 1. spacing issues 2. spelling correction 3. grammar correction 4. Add missing docs | ||||
* | | Merge pull request #16930 from todd/upgrade_guide | Abdelkader Boudih | 2014-09-17 | 1 | -4/+40 |
|\ \ | | | | | | | Added Responders docs, made Web Console docs more consistent. [ci skip] | ||||
| * | | Added Responders docs, made Web Console docs more consistent. [ci skip] | Todd Bealmear | 2014-09-16 | 1 | -4/+40 |
| | | | |||||
* | | | Merge pull request #16944 from akshay-vishnoi/docs-rails-4point2 | Rafael Mendonça França | 2014-09-17 | 14 | -22/+22 |
|\ \ \ | | |/ | |/| | [ci skip] AJ docs fixes | ||||
| * | | [ci skip] AJ docs fixes | Akshay Vishnoi | 2014-09-18 | 14 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | 1. Indentation 2. Spaces issues 3. Spelling correction 4. Grammar correction 5. Add #:nodoc: to all internal classes | ||||
* | | | Use has_attribute? | Rafael Mendonça França | 2014-09-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16875 from alan/dont_autosave_has_one_through_record | Rafael Mendonça França | 2014-09-17 | 3 | -1/+31 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't autosave unchanged has_one through records Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | Don't autosave unchanged has_one through records | Alan Kennedy | 2014-09-15 | 3 | -1/+31 |
| | | | | |||||
* | | | | Merge pull request #16943 from sgrif/sg-fix-tz-converter-serialization | Rafael Mendonça França | 2014-09-17 | 5 | -3/+28 |
|\ \ \ \ | | | | | | | | | | | Allow YAML serialization when using TZ aware attributes | ||||
| * | | | | Allow YAML serialization when using TZ aware attributes | Sean Griffin | 2014-09-17 | 5 | -3/+28 |
| | | | | | |||||
* | | | | | Merge pull request #11794 from yoazt/duration-eql | Rafael Mendonça França | 2014-09-17 | 3 | -1/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/duration.rb activesupport/test/core_ext/duration_test.rb | ||||
| * | | | | | Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`. | Joost Lubach | 2013-08-07 | 3 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the following returns `false`, contrary to expectation: 1.minute.eql?(1.minute) Adding method `#eql?` will make this behave like expected. Method `#eql?` is just a bit stricter than `#==`, as it checks whether the argument is also a uration. Their parts may be different though. 1.minute.eql?(60.seconds) # => true 1.minute.eql?(60) # => false | ||||
* | | | | | | Merge pull request #16929 from ↵ | Rafael Mendonça França | 2014-09-17 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | kongregate/fix-activerecord-deprecated_finders-find-symbol ActiveRecord deprecated finders are broken in 4.2 | ||||
| * | | | | | Backwards compat for activerecord-deprecated_finders | stopdropandrew | 2014-09-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain compatibility for: * ActiveRecord::Base#find(:all) * ActiveRecord::Base#find(:first) * ActiveRecord::Base#find(:last) | ||||
* | | | | | | OMG mysql! | Rafael Mendonça França | 2014-09-17 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | ruby-head should be green | Rafael Mendonça França | 2014-09-17 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.2 is near to be released so we should support it properly | ||||
* | | | | | | do not dump foreign keys for ignored tables. | Yves Senn | 2014-09-17 | 3 | -1/+8 |
| | | | | | | |||||
* | | | | | | unify wording in Active Record CHANGELOG. [ci skip] | Yves Senn | 2014-09-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | pg, correctly dump foreign keys targeting tables in a different schema. | Yves Senn | 2014-09-17 | 3 | -1/+35 |
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #16907. [Matthew Draper & Yves Senn] | ||||
* | | | | | Merge pull request #16844 from zerothabhishek/master | Rafael Mendonça França | 2014-09-16 | 1 | -4/+33 |
|\ \ \ \ \ | | | | | | | | | | | | | [guides] 4.2 release notes: added technical details for Adequate Record | ||||
| * | | | | | [guides] 4.2 release notes: added technical details for Adequate Record | abhishek | 2014-09-16 | 1 | -4/+33 |
| |/ / / / | |||||
* | | | | | Merge pull request #16841 from tjouan/environment-config-consistency | Rafael Mendonça França | 2014-09-16 | 1 | -3/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | Improve environment config templates consistency | ||||
| * | | | | Improve environment config templates consistency: | Thibault Jouan | 2014-09-16 | 1 | -3/+4 |
|/ / / / | | | | | | | | | | | | | | | | | * Fix long lines; * Use simple quotes for string literals when interpolation is not used. | ||||
* | | | | Merge pull request #16790 from cirosantilli/explain-erb-space-removal | Rafael Mendonça França | 2014-09-16 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Explain ERB space removal. [ci skip] | ||||
| * | | | | Explain ERB space removal. [ci skip] | Ciro Santilli | 2014-09-11 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error | Rafael Mendonça França | 2014-09-16 | 3 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Use dynamic path for dummy app location in plugin's test_helper.rb | ||||
| * | | | | | Use dynamic path for dummy app location in plugin's test_helper.rb | Yukio Mizuta | 2014-09-14 | 3 | -2/+10 |
| | | | | | | |||||
* | | | | | | Make explicit 4.1 is being maintained by a special situation | Rafael Mendonça França | 2014-09-16 | 1 | -1/+4 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #16927 from akshay-vishnoi/fix-typo | Rafael Mendonça França | 2014-09-15 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | [ci skip] Fix typo `equals to` --> `equal to` | ||||
| * | | | | [ci skip] Fix typo `equals to` --> `equal to` | Akshay Vishnoi | 2014-09-16 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | As of Unicode 6.3, Mongolian Vowel Separator is not whitespace | Matthew Draper | 2014-09-15 | 4 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's not a good candidate for testing String#squish. | ||||
* | | | | Merge pull request #16574 from lsylvester/duration-respond_to | Jeremy Kemper | 2014-09-14 | 3 | -2/+19 |
|\ \ \ \ | | | | | | | | | | | add implementation of respond_to? for ActiveSupport::Duration | ||||
| * | | | | add implementation of respond_to? for ActiveSupport::Duration | lsylvester | 2014-09-15 | 3 | -2/+19 |
|/ / / / | |||||
* | | | | Merge pull request #16922 from y-yagi/add_test_jobs_task | Godfrey Chan | 2014-09-15 | 2 | -6/+17 |
|\ \ \ \ | | | | | | | | | | | Add test jobs task | ||||
| * | | | | Add `test:jobs` task | yuuji.yaginuma | 2014-09-15 | 2 | -6/+17 |
| | | | | | |||||
* | | | | | handle <%== nil %> cases | Aaron Patterson | 2014-09-14 | 4 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is much less common than string literal appends, so add a special case method for it. Maybe fixes bug reported by @jeremy on 97ef636191933f1d4abc92fc10871e6d1195285c | ||||
* | | | | | Merge pull request #16920 from seuros/aj | Jeremy Kemper | 2014-09-14 | 1 | -43/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | simplify test_adapter | ||||
| * | | | | | simplify test_adapter | Abdelkader Boudih | 2014-09-14 | 1 | -43/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #16918 from kiuru/master | Abdelkader Boudih | 2014-09-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Singular credit_card controller name changed to plural [ci skip] | ||||
| * | | | | | Singular credit_card controller name changed to plural | Niko Kiuru | 2014-09-14 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Tighten up AJ::Arguments and its tests | Jeremy Kemper | 2014-09-14 | 3 | -85/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Disallow deserialization of non-primitive objects * Broaden coverage; remove superfluous tests | ||||
* | | | | | Pare down and simplify Active Job's rake tasks | Jeremy Kemper | 2014-09-14 | 2 | -59/+34 |
| | | | | | |||||
* | | | | | Stop nil checking on safe_append= | Aaron Patterson | 2014-09-14 | 1 | -4/+0 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | ERB compiler guarantees safe_append= will be called with a string, so nil checks don't make sense. Anything else calling this method should check for nil themselves before calling | ||||
* | | | | Merge pull request #16912 from yuki24/rescue-rack-parameter-type-error | Jeremy Kemper | 2014-09-13 | 2 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError` | ||||
| * | | | | Rescue Rack::Utils::ParameterTypeError instead of TypeError | Yuki Nishijima | 2014-09-13 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of rack/rack@167b6480235ff00ed5f355698bf00ec2f250f72e, Rack raises Rack::Utils::ParameterTypeError which inherits TypeError. In terms of the behavior, Rescuing TypeError still works but this method shouldn't rescue if TypeError is raised for other reasons. | ||||
* | | | | | Merge pull request #16758 from Agis-/time-change-nsec | Jeremy Kemper | 2014-09-13 | 3 | -6/+25 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add support for `:nsec` option to `Time#change` | ||||
| * | | | | Time#change can now change nanoseconds (:nsec) | Agis- | 2014-09-14 | 3 | -6/+25 |
| | | | | | | | | | | | | | | | | | | | | Closes #16392. |