aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ruby-2.2'Aaron Patterson2014-01-102-1/+6
|\
| * Merge branch 'master' into ruby-2.2Aaron Patterson2014-01-092-17/+11
| |\
| * | Check `respond_to` before delegation due to: https://github.com/ruby/ruby/com...Aaron Patterson2014-01-092-1/+6
* | | doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]Yves Senn2014-01-101-0/+1
* | | Merge pull request #13657 from leriksen/masterYves Senn2014-01-091-2/+0
|\ \ \
| * | | [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce ...leriksen2014-01-101-2/+0
* | | | Merge pull request #13659 from prathamesh-sonpatki/fix-buildGuillermo Iguaran2014-01-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Restore DATABASE_URL even if it's nil in connection_handler testPrathamesh Sonpatki2014-01-101-1/+1
|/ / /
* | | Merge pull request #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-0911-33/+409
|\ \ \ | |_|/ |/| |
| * | Ensure Active Record connection consistencyschneems2014-01-0911-33/+409
* | | Revert "ask the fixture set for the sql statements"Aaron Patterson2014-01-092-17/+11
| |/ |/|
* | Merge pull request #13632 from tinogomes/masterRafael Mendonça França2014-01-095-0/+63
|\ \ | |/ |/|
| * Adding Hash#compact and Hash#compact! methodstinogomes2014-01-095-0/+63
* | Merge pull request #13644 from zzak/doc_mysql_config_templateGuillermo Iguaran2014-01-081-1/+1
|\ \
| * | MySQL version 4.1 was EOL on December 31, 2009Zachary Scott2014-01-081-1/+1
|/ /
* | clear cache on body close so that cache remains during renderingAaron Patterson2014-01-082-2/+45
* | add a more restricted codepath for templates fixes #13390Aaron Patterson2014-01-082-12/+51
* | Merge pull request #13637 from craftsmen/app-generator-minor-fixRafael Mendonça França2014-01-081-4/+4
|\ \
| * | Move finish_template as the last public method in the generatorMehdi Lahmam2014-01-081-4/+4
| |/
* | refactor generator tests to use block form of TempfileAaron Patterson2014-01-081-36/+30
* | Merge pull request #13634 from jwworth/masterCarlos Antonio da Silva2014-01-081-1/+1
|\ \ | |/ |/|
| * Fix typo [ci skip]Jake Worth2014-01-081-1/+1
|/
* Minor typos fix [ci skip]Robin Dupret2014-01-081-3/+3
* make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-083-1/+26
* Merge pull request #13629 from dmathieu/drop_testYves Senn2014-01-085-5/+40
|\
| * create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-085-5/+40
|/
* Revert "Speedup String#to"Yves Senn2014-01-082-3/+1
* typo fix in test name. [ci skip].Yves Senn2014-01-081-1/+1
* `core_ext/string/access.rb` test what we are documenting.Yves Senn2014-01-081-50/+89
* Merge pull request #13355 from dylanahsmith/migration-versionRafael Mendonça França2014-01-074-1/+19
|\
| * activerecord: Initialize Migration with version from MigrationProxy.Dylan Thacker-Smith2014-01-064-1/+18
* | Merge pull request #13621 from Intrepidd/patch-1Xavier Noria2014-01-071-1/+1
|\ \
| * | Fix typo in image_tag documentationAdrien2014-01-071-1/+1
|/ /
* | Merge pull request #13597 from prathamesh-sonpatki/hstore_migrationYves Senn2014-01-076-15/+43
|\ \
| * | Make change_table use object of current database adapterNishant Modak2014-01-076-15/+43
* | | Use a better method name to check the requirement of password confirmationCarlos Antonio da Silva2014-01-072-8/+8
|/ /
* | Merge pull request #13617 from arthurnn/error_varRafael Mendonça França2014-01-061-2/+2
|\ \
| * | Add 'e' var on rescue DalliError, in order to log itArthur Neves2014-01-061-2/+2
|/ /
* | Merge pull request #13616 from zirni/remove_warningsRafael Mendonça França2014-01-061-1/+1
|\ \ | |/ |/|
| * Remove warnings in test suiteMatthias Zirnstein2014-01-061-1/+1
|/
* Merge pull request #13593 from oliveiraethales/store_yaml_coderYves Senn2014-01-065-1/+14
|\
| * Fix: ActiveRecord::Store TypeError conversion when using YAML coderThales Oliveira2014-01-065-1/+14
* | add example to the CHANGELOG entry from 3a48b83e5 [ci skip].Yves Senn2014-01-061-2/+8
* | Fix typo in AS changelog, improve highlight [ci skip]Carlos Antonio da Silva2014-01-061-2/+2
* | Fix AR connection resolver docs to return a hash with string keys [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
* | Fix typo [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
* | Fix rdoc markup [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
* | Merge pull request #13611 from robinboening/plugin_generator_testsYves Senn2014-01-061-0/+6
|\ \
| * | Add missing tests for invalid names in `rails plugin new`Robin Böning2014-01-061-0/+6
* | | Fix typo in AMo docs [ci skip]Carlos Antonio da Silva2014-01-061-1/+1