aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Use bundler 1.7 on travisSean Griffin2015-01-181-0/+1
| | | | | |
* | | | | | Include stackprof on ruby 2.2 as well as 2.1Sean Griffin2015-01-181-1/+1
|/ / / / /
* | | | | Merge pull request #18576 from yui-knk/fix/autoload4Santiago Pastorino2015-01-181-3/+2
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Move a introduction of `Module.nesting`
| * | | | | [ci skip] Move a introduction of `Module.nesting`yui-knk2015-01-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move a introduction of `Module.nesting` to the beginning of sentence. This change will help reader to try to dump `nesting`.
* | | | | | Merge pull request #18579 from ↵Santiago Pastorino2015-01-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/use-existing-constant-for-join Use existing constant for joining instead of '_'
| * | | | | | Use existing constant for joining instead of '_'Prathamesh Sonpatki2015-01-181-1/+1
| | | | | | |
* | | | | | | Merge pull request #18578 from y-yagi/remove_logger_extensionsAbdelkader Boudih2015-01-181-44/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | remove reference to `Logger` core extensions from guide [ci skip]
| * | | | | | remove reference to `Logger` core extensions from guide [ci skip]yuuji.yaginuma2015-01-181-44/+0
| | | | | | |
* | | | | | | Merge pull request #18577 from prathamesh-sonpatki/nodoc-av-modelnamingGuillermo Iguaran2015-01-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | nodoc ActionView::ModelNaming module
| * | | | | | nodoc ActionView::ModelNaming modulePrathamesh Sonpatki2015-01-181-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Its only used by ActionView internals and not supposed to be used through public API.
* | | | | | Merge pull request #18575 from yui-knk/fix/autoloadZachary Scott2015-01-171-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] fix positions of parentheses
| * | | | | [ci skip] fix positions of parenthesesyui-knk2015-01-181-5/+5
|/ / / / /
* | | | | Merge pull request #18569 from yuki24/eliminate-warning-in-action-view-testYves Senn2015-01-171-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Eliminate a ruby warning in a test in Action View
| * | | | | Eliminate a ruby warning in a test in Action ViewYuki Nishijima2015-01-171-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates the warning below: actionview/test/template/form_helper_test.rb:913: warning: method redefined; discarding old id_came_from_user? actionview/test/template/form_helper_test.rb:104: warning: previous definition of id_came_from_user? was here
* | | | | Merge pull request #18567 from prathamesh-sonpatki/fix-assert-welcome-testRichard Schneeman2015-01-171-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fixed test for assert_welcome
| * | | | | Fixed test for assert_welcomePrathamesh Sonpatki2015-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Test was wrongly using assert with assignment statement.
* | | | | | bring back unintentionally removed blank line [ci skip]Yves Senn2015-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks @carlosantoniodasilva :yellow_heart:
* | | | | | 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