aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #18568 from vipulnsward/removed-deprecated-methods-from-docsZachary Scott2015-01-171-18/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Removed documentation of deprecated removed methods
| * | | | | Removed documentation of deprecated removed methods [ci skip]Vipul A M2015-01-171-18/+2
| | | | | |
* | | | | | Merge pull request #18566 from yuki24/fix-assertion-in-ar-case-date-timeCarlos Antonio da Silva2015-01-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a false assertion
| * | | | | | Fix a false assertionYuki Nishijima2015-01-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | #assert was used when it should be assert_equal.
* | | | | | Merge pull request #18564 from yui-knk/fix/autoload2Abdelkader Boudih2015-01-171-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] Change to the passive voice
| * | | | | [ci skip] Change to the passive voiceyui-knk2015-01-171-1/+1
|/ / / / /
* | | | | Merge pull request #18493 from twoller/masterYves Senn2015-01-172-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Consistent anchor text in nav links, new image [ci skip]
| * | | | | Use consistent anchor text throughout the guide.Toby Woller2015-01-152-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change all of anchor text in the nav links to `Back` and `Edit` Use `Edit | Back` on pages that use both links to conform to what scaffolding generates. Use consistent anchor text throughout the guide. Change all of anchor text in the nav links to `Back` and `Edit` Use `Edit | Back` on pages that use both links to conform to what scaffolding generates.
* | | | | | Merge pull request #18558 from robertomiranda/patch-3 [ci skip]Yves Senn2015-01-171-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update Molde Generator Usage
| * | | | | | Update Molde Generator UsageRoberto Miranda2015-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | Including has_secure_token generator
* | | | | | | Merge pull request #18554 from mechanicles/use-take-methodSantiago Pastorino2015-01-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | A little performance improvement using 'take' method over 'first'
| * | | | | | | A little performance improvement using 'take' method over 'first'Santosh Wadghule2015-01-161-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #18562 from vipulnsward/fix-broken-hwai-frozen-tetSantiago Pastorino2015-01-172-7/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix hwia isolated tests
| * | | | | | | - Moved hwia frozen value assignment test to hash_ext_test similar to other ↵Vipul A M2015-01-172-7/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests - Fixed the wrong use of with_indifferent_access on hash in the test which failed for isolated tests - Renamed to appropriately specify what the test does
* | | | | | | Merge pull request #18560 from ogennadi/patch-2Abdelkader Boudih2015-01-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed extraneous quoting
| * | | | | | | Fixed extraneous quotingOge Nnadi2015-01-161-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18559 from ogennadi/patch-1Zachary Scott2015-01-161-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Typo fix
| * | | | | | Typo fixOge Nnadi2015-01-161-1/+1
|/ / / / / /
* | | | | | Merge pull request #18551 from aditya-kapoor/fix-frozen-hwiaAndrew White2015-01-163-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix assignment for frozen value in HWIA
| * | | | | | Fix assignment for frozen value in HWIAAditya Kapoor2015-01-173-1/+15
| |/ / / / /
* | | | | | Merge pull request #18556 from jfine/patch-1Rafael Mendonça França2015-01-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Underscore typo [ci skip]
| * | | | | | Underscore typo [ci skip]Jared Fine2015-01-161-1/+1
|/ / / / / /
* | | | | | Merge pull request #18437 from eldano/feed_entry_no_link_optionSantiago Pastorino2015-01-163-2/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use option url: false to allow entries without a link tag
| * | | | | | Use option url: false to allow entries without a link tagDaniel Gomez de Souza2015-01-163-2/+30
|/ / / / / /
* / / / / / Specify correct version in the changelog [ci skip]Sean Griffin2015-01-161-1/+1
|/ / / / /
* | | | | docs, update "How to run Active Record tests". [ci skip]Yves Senn2015-01-151-1/+5
| | | | |
* | | | | Merge pull request #18543 from henrik/integer_limit_or_defaultYves Senn2015-01-151-2/+6
|\ \ \ \ \ | | | | | | | | | | | | Tiny: DRY default limit in ActiveRecord::Type::Integer
| * | | | | DRY default limit in ActiveRecord::Type::IntegerHenrik Nyh2015-01-151-2/+6
| | | | | |
* | | | | | Merge pull request #18544 from henrik/ar_type_value_commentRafael Mendonça França2015-01-151-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Tiny: Remove incorrect comment in ActiveRecord::Type::Value
| * | | | | Remove incorrect comment in ActiveRecord::Type::ValueHenrik Nyh2015-01-151-2/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Says it's only used for the schema, but they are in fact used for other things. Integer verifies against the limit during casting, and Decimal uses precision during casting. It may be true that scale is only used for the schema.
* | | | | Merge pull request #18541 from andreynering/getting-started-javascriptAbdelkader Boudih2015-01-151-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Adding tip about jQuery UJS [ci skip]
| * | | | | Adding tip about jQuery UJS [ci skip]Andrey Nering2015-01-151-0/+3
|/ / / / / | | | | | | | | | | | | | | | Reference #18533
* | | | | Merge pull request #18539 from aditya-kapoor/correct-typoAbdelkader Boudih2015-01-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] fix typo sill -> still
| * | | | | [ci skip] fix typo sill -> stillAditya Kapoor2015-01-151-1/+1
|/ / / / /
* | | | | Merge pull request #18537 from jrnk/patch-1Zachary Scott2015-01-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Typo SecureToken for schema sample [ci skip]
| * | | | | Fix Typo SecureToken for schema sample [ci skip]Jeroen K.2015-01-151-1/+1
| | | | | |
* | | | | | Merge pull request #15726 from sgrif/sg-time-zone-aware-timesSean Griffin2015-01-158-8/+116
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Time columns should support time zone aware attributes
| * | | | | Time columns should support time zone aware attributesSean Griffin2015-01-158-8/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The types that are affected by `time_zone_aware_attributes` (which is on by default) have been made configurable, in case this is a breaking change for existing applications.
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-156-99/+138
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed spacing issues on code comments in ActiveJob Basics guide.Vipul A M2015-01-141-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: http://take.ms/z39h2 After: http://take.ms/Mo0G3
| * | | | | GlobalID::Identification has been mixed into AR not AMCristian Bica2015-01-081-1/+1
| | | | | |
| * | | | | Fix typo "you can be disable"claudiob2015-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/rails/rails/issues/18372 [ci skip]
| * | | | | Better examples for fresh_when and stale?claudiob2015-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is clearer and closer to reality to use `@article.updated_at` as the `:last_modified` parameter of `fresh_when` and `stale?`. Using `@article.created_at` would result in the cache never expiring, since the creation timestamp never changes. [ci skip]
| * | | | | Fix docs for ActiveSupport::Inflector methodsclaudiob2015-01-032-81/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many methods in ActiveSupport::Inflector were actually documenting the String methods with the same name. For instance the doc for `camelize` said: > If the argument to +camelize+ is set to <tt>:lower</tt>... while it should say: > If the +uppercase_first_letter+ parameter is set to false [ci skip]
| * | | | | Better example of `teardown` method in test guideKir Shatrov2015-01-031-4/+2
| | | | | | | | | | | | | | | | | | rails/rails#18305, thanks for @dhh suggestion
| * | | | | Demonstrate example of `assert_emails` in testing guideKir Shatrov2015-01-031-3/+4
| | | | | | | | | | | | | | | | | | rails/rails#18305, thanks for @dhh suggestion
| * | | | | Docs for controller test helpersKir Shatrov2015-01-031-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | rails/rails#18305
| * | | | | Avoid double negation in test guideKir Shatrov2015-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | rails/rails#18305
| * | | | | Section about testing xhr requestsKir Shatrov2015-01-031-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | rails/rails#18305
* | | | | | Only use the `_before_type_cast` in the form when from user inputSean Griffin2015-01-145-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we don't want to change the form input when validations fail, blindly using `_before_type_cast` will cause the input to display the wrong data for any type which does additional work on database values.