aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10542 from waseem/remove_requireCarlos Antonio da Silva2013-06-251-1/+0
|\
| * Remove unnecessary require from active_support/inflector/methods.rbWaseem Ahmad2013-05-101-1/+0
* | Merge pull request #10774 from chuckbergeron/validates-inclusion-of-accuracy-...Carlos Antonio da Silva2013-06-254-4/+15
|\ \
| * | Use Range#cover? for Numeric ranges (tests via endpoints) and use Range#inclu...Charles Bergeron2013-05-274-4/+10
* | | Merge pull request #10627 from vipulnsward/destructive_symbolizeCarlos Antonio da Silva2013-06-251-1/+1
|\ \ \
| * | | change to destructive `deep_symbolize_keys` after https://github.com/rails/ra...Vipul A M2013-05-151-1/+1
* | | | Merge pull request #10666 from YanhaoYang/masterCarlos Antonio da Silva2013-06-251-1/+1
|\ \ \ \
| * | | | make "rails dbconsole" work with activerecord-postgis-adapterYanhaoYang2013-05-171-1/+1
* | | | | Merge pull request #10730 from tkhr/add_test_for_AR__CounterCache#update_coun...Carlos Antonio da Silva2013-06-251-8/+9
|\ \ \ \ \
| * | | | | Refactor AR's counter_cache_test.rb testTakehiro Adachi2013-05-231-8/+3
| * | | | | Add test for AR::CounterCache.update_countersTakehiro Adachi2013-05-231-0/+6
* | | | | | Add changelog entry for database tasks removal #10853 [ci skip]Carlos Antonio da Silva2013-06-251-0/+4
* | | | | | Merge pull request #10853 from kennyj/deprecated-database_tasksCarlos Antonio da Silva2013-06-257-433/+0
|\ \ \ \ \ \
| * | | | | | Remove FirebirdDatabaseTasks was deprecated, because this was provided by 3rd...kennyj2013-06-053-158/+0
| * | | | | | Remove SqlseverDatabaseTasks was deprecated, because this was provided by 3rd...kennyj2013-06-053-136/+0
| * | | | | | Remove OracleDatabaseTasks was deprecated, because this was provided by 3rd-p...kennyj2013-06-053-139/+0
* | | | | | | Merge branch 'cache-fragment-refactor'Carlos Antonio da Silva2013-06-251-13/+17
|\ \ \ \ \ \ \
| * | | | | | | Refactor cache fragment handling with read/write methodsCarlos Antonio da Silva2013-06-251-6/+6
| * | | | | | | Move the write portion of fragment_for to its own method to allow for easier ...Andrew Rove2013-06-251-10/+14
|/ / / / / / /
* | | | | | | Merge pull request #10992 from Empact/find-each-enumeratorCarlos Antonio da Silva2013-06-253-2/+36
|\ \ \ \ \ \ \
| * | | | | | | When .find_each is called without a block, return an Enumerator.Ben Woosley2013-06-193-2/+36
* | | | | | | | Merge pull request #10993 from Empact/result-each-enumeratorCarlos Antonio da Silva2013-06-253-1/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Change Result#each to return an Enumerator when called without a block.Ben Woosley2013-06-183-1/+43
* | | | | | | | | Merge pull request #11105 from mariozig/correct-documentationCarlos Antonio da Silva2013-06-252-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo in docs. HABTM associations should use a pluralized namemariozig2013-06-252-2/+2
* | | | | | | | | | Merge pull request #11000 from sbeckeriv/accept_headerCarlos Antonio da Silva2013-06-253-1/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix undefined method `ref' for nil:NilClass for bad accept headersStephen Becker IV2013-06-193-1/+11
* | | | | | | | | | Merge pull request #11046 from arunagw/verbose_mode_onCarlos Antonio da Silva2013-06-255-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adding verbose in isolated test.Arun Agrawal2013-06-215-5/+5
| * | | | | | | | | | Adding verbose mode to test_with_ar_integrationArun Agrawal2013-06-211-0/+2
* | | | | | | | | | | Merge branch 'error-explanation'Carlos Antonio da Silva2013-06-252-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix another "error_explanation" css class in guides [ci skip]Carlos Antonio da Silva2013-06-251-3/+3
| * | | | | | | | | | | change id="errorExplanation" to id="error_explanation" to match the generated...Luzi Humm2013-06-251-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #11096 from akalyaev/remove-unnecessary-mappingCarlos Antonio da Silva2013-06-251-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | removed unnecessary mapping for on optionsAnton Kalyaev2013-06-251-5/+5
* | | | | | | | | | | | Merge pull request #11095 from vipulnsward/rails_4_docsXavier Noria2013-06-253-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | We are now rails 4 [skip-ci]Vipul A M2013-06-263-5/+8
* | | | | | | | | | | | | Merge pull request #11098 from vredniy/masterRafael Mendonça França2013-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed menu section's location (guides)Dima Zudochkin2013-06-251-1/+1
* | | | | | | | | | | | | | Merge pull request #11097 from ryancw/patch-2Rafael Mendonça França2013-06-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Comment typoRyan Williams2013-06-251-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #11093 from nolman/restoring-scaffold-generationRafael Mendonça França2013-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | restore correct scaffold generationNolan Evans2013-06-251-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Change reference to all to scoped instead.Steve Klabnik2013-06-251-1/+1
* | | | | | | | | | | | Merge pull request #11088 from nolman/nolman/scaffold-fixSteve Klabnik2013-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix deprecation warning in scaffold controllersNolan Evans2013-06-251-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #11084 from arkiver/masterYves Senn2013-06-253-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixing Issue #11083Akshay Khole2013-06-253-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | remove trailing whitespace from Active Record CHANGELOGYves Senn2013-06-251-1/+1
* | | | | | | | | | | Clarify what arguments are passed to redirect blocks - fixes #11056Andrew White2013-06-251-3/+3