aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16722 from yui-knk/fix/guides_association_basics2Rafael Mendonça França2014-08-271-4/+4
|\
| * [ci skip] Fix typo of `collection_singular_ids=` method.yui-knk2014-08-271-4/+4
* | Merge pull request #16721 from yui-knk/fix/guides_association_basicsRafael Mendonça França2014-08-271-4/+4
|\ \ | |/ |/|
| * [ci skip] Fix typo of `collection=` method.yui-knk2014-08-271-4/+4
|/
* Merge pull request #16719 from tgxworld/fix_spelling_in_changelogArun Agrawal2014-08-271-1/+1
|\
| * Fix spelling. [CI SKIP]Guo Xiang Tan2014-08-271-1/+1
|/
* fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-273-4/+23
* minor changelog formatting changes.Yves Senn2014-08-273-9/+11
* Merge pull request #16661 from edogawaconan/doc-fixYves Senn2014-08-271-1/+1
|\
| * Update documentation to match change in #5942 [ci skip]edogawaconan2014-08-241-1/+1
* | Merge pull request #16715 from y-yagi/update_4_2_release_notesZachary Scott2014-08-271-1/+1
|\ \
| * | [ci skip] Modify a web-console PR linkyuuji.yaginuma2014-08-271-1/+1
|/ /
* | Merge pull request #16713 from tomkadwill/documented_eqls_other_paramZachary Scott2014-08-271-1/+1
|\ \
| * | [ci skip] Updated documentation syntax of other parameter for rdocTom Kadwill2014-08-271-1/+1
|/ /
* | Merge pull request #16708 from zzak/bcjordan-patch-1Zachary Scott2014-08-261-16/+16
|\ \
| * | Adjusted punctuation and grammar for Form Helpers guide [ci skip]Brian Jordan2014-08-261-16/+16
|/ /
* | Merge pull request #16705 from tomkadwill/documented_many_block_paramZachary Scott2014-08-261-1/+1
|\ \
| * | [ci skip] Updated documentation syntax of block parameter for rdoc Tom Kadwill2014-08-261-1/+1
* | | Merge pull request #16706 from tomkadwill/documented_include_record_paramZachary Scott2014-08-261-1/+1
|\ \ \
| * | | [ci skip] Updated include to reference record parameter for rdocTom Kadwill2014-08-261-1/+1
|/ / /
* | | Merge pull request #16703 from tomkadwill/documented_any_block_paramZachary Scott2014-08-261-1/+1
|\| |
| * | [ci skip] Updated documentation syntax of block parameter for rdocTom Kadwill2014-08-261-1/+1
|/ /
* | Merge pull request #16700 from seuros/autoloadRafael Mendonça França2014-08-263-2/+18
|\ \
| * | [ActiveJob] Autoload adaptersAbdelkader Boudih2014-08-263-2/+18
* | | Merge pull request #16613 from splattael/masterMatthew Draper2014-08-271-7/+10
|\ \ \
| * | | Speed up JRuby tests by improving its startup timePeter Suschlik2014-08-251-7/+10
* | | | Keep the first string we fetchMatthew Draper2014-08-271-1/+1
| |/ / |/| |
* | | Merge pull request #16697 from tomkadwill/has_and_belongs_to_many_documenting...Zachary Scott2014-08-261-0/+15
|\ \ \
| * | | [ci skip] Added documentation for has_and_belongs_to_many extension parameterTom Kadwill2014-08-261-0/+15
|/ / /
* | | Merge pull request #16646 from sgrif/sg-perf-regressionJeremy Kemper2014-08-251-1/+20
|\ \ \
| * | | Cache the value of `changed_attributes` when calling `changes_applied`Sean Griffin2014-08-221-1/+20
* | | | Override #find_by! in core to enable AST cachingGodfrey Chan2014-08-252-0/+26
* | | | Fixed find_by("sql fragment without bindings") on masterGodfrey Chan2014-08-254-17/+23
* | | | Merge pull request #16695 from ericbrooke/patch-1Rafael Mendonça França2014-08-251-1/+1
|\ \ \ \
| * | | | Added web linksEric Brooke2014-08-251-1/+1
|/ / / /
* | | | Merge pull request #16689 from ankit1910/improve-englishEileen M. Uchitelle2014-08-251-2/+2
|\ \ \ \
| * | | | [ci skip] make assert messages consistentankit19102014-08-251-2/+2
* | | | | Merge pull request #16682 from untidy-hair/use_activesupport_concernJeremy Kemper2014-08-251-7/+7
|\ \ \ \ \
| * | | | | Use ActiveSupport::Concern instead of the traditinal wayYukio Mizuta2014-08-251-7/+7
* | | | | | Quick pass through the 4.2 release notes [ci skip]Robin Dupret2014-08-251-20/+21
* | | | | | Merge pull request #16690 from ankit1910/proper-use-of-aporstropheRafael Mendonça França2014-08-251-1/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] use proper apostropheankit19102014-08-251-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16488 from agrobbin/form-label-builderJeremy Kemper2014-08-253-22/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | provide a builder for form labels to customize wrapping around I18n contentAlex Robbin2014-08-203-22/+62
* | | | | | pg, `default_sequence_name` needs to return a string.Yves Senn2014-08-253-8/+12
| |_|_|/ / |/| | | |
* | | | | Merge pull request #16681 from seuros/masterJeremy Kemper2014-08-241-0/+1
|\ \ \ \ \
| * | | | | [ActiveJob] Add activesupport as dependency [ci skip]Abdelkader Boudih2014-08-241-0/+1
* | | | | | Merge pull request #16639 from agrobbin/input-placeholder-i18nJeremy Kemper2014-08-245-0/+231
|\ \ \ \ \ \
| * | | | | | just use the placeholder tag value if it is passed as a StringAlex Robbin2014-08-222-5/+22
| * | | | | | add I18n support for `:placeholder` HTML option is passed to form fieldsAlex Robbin2014-08-225-0/+214