aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19077 from robin850/unknown-attribute-errorSean Griffin2015-03-0211-24/+30
|\
| * Follow-up to #10776Robin Dupret2015-02-2611-24/+30
* | Remove not needed .tapArthur Neves2015-03-021-1/+1
* | Merge pull request #19172 from JuanitoFatas/doc/fix-typoRichard Schneeman2015-03-021-2/+2
|\ \
| * | [ci skip] Fix a typo for PostgreSQL text limit, GB instead of Gb.Juanito Fatas2015-03-031-2/+2
* | | Make private methods privateArthur Neves2015-03-021-0/+2
* | | Remove !has_transactional_callbacks? checkArthur Neves2015-03-021-1/+1
* | | Merge pull request #19170 from JuanitoFatas/doc/active_record/connection_adap...Carlos Antonio da Silva2015-03-021-1/+1
|\ \ \
| * | | Clarify that t.references and t.belongs_to are interchangeable. [ci skip]Juanito Fatas2015-03-021-1/+1
| |/ /
* | | call `sync_with_transaction_state` inside `persisted?` then check ivarsAaron Patterson2015-03-021-1/+2
* | | remove useless instance variableAaron Patterson2015-03-021-9/+4
* | | Merge pull request #19169 from hjoo/rake_restartEileen M. Uchitelle2015-03-021-1/+1
|\ \ \ | |/ / |/| |
| * | Rake restart task no longer loads entire Rails environment when run.Hyonjee Joo2015-03-021-1/+1
|/ /
* | Do not output in the consoleRafael Mendonça França2015-03-021-1/+1
* | Merge pull request #19106 from teeceepee/patch-1Eileen M. Uchitelle2015-03-021-7/+8
|\ \
| * | Modify guides for a better sounding sentenceYu Haidong2015-03-021-3/+3
| * | Improve guidesYu Haidong2015-02-271-7/+8
* | | Merge pull request #19133 from davydovanton/update-doc-example-mail-block-formatRobin Dupret2015-03-021-1/+11
|\ \ \
| * | | [ci skip] Add code example for MailHelper#block_format documentationAnton Davydov2015-03-021-1/+11
* | | | Merge pull request #19168 from gsamokovarov/byebug-defaults-guideRobin Dupret2015-03-021-3/+3
|\ \ \ \
| * | | | Nit pick the byebug settings guide for default values [ci skip]Genadi Samokovarov2015-03-021-3/+3
* | | | | Merge pull request #19097 from gsamokovarov/web-console-guideRobin Dupret2015-03-021-49/+58
|\ \ \ \ \
| * | | | | Web Console documentation for the upcoming 2.1 release [ci skip]Genadi Samokovarov2015-03-021-49/+58
* | | | | | Merge pull request #19167 from limekin/masterArun Agrawal2015-03-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fixing incorrect class name used in an example.Kevin Jayanthan2015-03-021-1/+1
|/ / / / / /
* | | | | | Merge pull request #19163 from JuanitoFatas/feautre/enumerable-without-take-2Richard Schneeman2015-03-012-2/+1
|\ \ \ \ \ \
| * | | | | | Use include? instead of in? for Enumerable#without.Juanito Fatas2015-03-022-2/+1
* | | | | | | Merge pull request #19159 from stephenminded/docs_fix_polymorphic_indexArthur Nogueira Neves2015-03-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Composite index is [:imageable_type, :imageable_id] [ci skip]Steve Lounsbury2015-03-011-1/+1
* | | | | | | | Move transaction code to transaction moduleArthur Neves2015-03-012-41/+41
| |/ / / / / / |/| | | | | |
* | | | | | | Remove parent transaction stateArthur Neves2015-03-012-7/+0
* | | | | | | Merge pull request #19161 from JuanitoFatas/fix/include-inclusionDavid Heinemeier Hansson2015-03-011-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Include object inclusion for enumerable test.Juanito Fatas2015-03-021-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #19157 from todd/enumerable_withoutDavid Heinemeier Hansson2015-03-015-0/+46
|\ \ \ \ \ \ \
| * | | | | | | Add Enumerable#withoutTodd Bealmear2015-03-015-0/+46
* | | | | | | | remove useless conditionalAaron Patterson2015-03-011-1/+1
* | | | | | | | refactor `handle_model` to use private helper methods for generationAaron Patterson2015-03-011-8/+6
* | | | | | | | drop allocations for string and class polymorphic routesAaron Patterson2015-03-011-3/+3
* | | | | | | | Merge pull request #19152 from tchandy/removing_unused_mailer_templatesCarlos Antonio da Silva2015-03-0118-50/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Removing unused mailer templatesThiago Pradi2015-03-0118-50/+0
* | | | | | | | | drop string allocations per model url_for call in viewsAaron Patterson2015-03-011-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Bump rack-test to fix nil values being sent to `parse_nested_query`eileencodes2015-03-012-2/+2
* | | | | | | | move _generate_paths_by_default to where it is usedAaron Patterson2015-03-012-6/+6
* | | | | | | | Merge pull request #19153 from stephenminded/docs_fix_polymorphic_indexAbdelkader Boudih2015-03-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * / / / / / Indexing a polymorphic assoc adds index on type and id [ci skip]Steve Lounsbury2015-03-011-1/+1
|/ / / / / /
* | | | | | Merge pull request #19149 from yui-knk/fix/4_0_release_notes2Rafael Mendonça França2015-03-011-1/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] Fix fenced code block langyui-knk2015-03-021-1/+1
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-013-3/+20
|\ \ \ \ \ \
| * | | | | | Explained how to set session expiry through session_store configIain Beeston2015-02-273-3/+20
* | | | | | | Merge pull request #19148 from yui-knk/fix/4_0_release_notesCarlos Antonio da Silva2015-03-011-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |