aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #12874 from chancancode/better_as_loading_guidesRafael Mendonça França2013-11-131-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Make it clear that require 'active_support' is required [ci-skip]Godfrey Chan2013-11-131-1/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #12772 from dmathieu/no_touchingRafael Mendonça França2013-11-135-0/+112
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add #no_touching on ActiveRecord modelsDamien Mathieu2013-11-135-0/+112
* | | | | | | fix weird Emacs auto indentation. [ci skip]Yves Senn2013-11-131-8/+8
* | | | | | | tests for merging Relations of different classes.Yves Senn2013-11-131-0/+19
* | | | | | | move Relation#merge tests into separate file.Yves Senn2013-11-132-121/+131
* | | | | | | Merge pull request #12870 from sauliusg/atom-feed-doc-fixYves Senn2013-11-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix syntax error in atom_feed example [ci skip]Saulius Grigaliunas2013-11-131-1/+1
* | | | | | | | Ensure that a column added in a test is being removed after allAkira Matsuda2013-11-131-0/+7
|/ / / / / / /
* | | | | | | Revert "`remove_column` does not take a type argument. [ci skip]. Closes #12864"Yves Senn2013-11-131-1/+1
* | | | | | | Merge pull request #12865 from JuanitoFatas/layout-and-renderCarlos Antonio da Silva2013-11-121-4/+3
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix curl response output and use strong parameters in update action.Juanito Fatas2013-11-131-4/+3
|/ / / / / / /
* / / / / / / `remove_column` does not take a type argument. [ci skip]. Closes #12864Yves Senn2013-11-121-1/+1
|/ / / / / /
* | | | | | Merge pull request #11921 from Empact/sqlite-3-cleanupYves Senn2013-11-122-12/+1
|\ \ \ \ \ \
| * | | | | | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?Ben Woosley2013-11-121-5/+0
| * | | | | | Drop a sqlite_version check because we only support SQLite 3.6.16 or newer.Ben Woosley2013-11-122-7/+1
|/ / / / / /
* | | | | | Merge pull request #12695 from mikepack/allow_pathnamesYves Senn2013-11-113-1/+19
|\ \ \ \ \ \
| * | | | | | Allow Pathnames to be added to eager load pathsMike Pack2013-11-113-1/+19
* | | | | | | Merge pull request #12851 from RKushnir/masterYves Senn2013-11-112-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Include URL helpers in TestController in bug report templatesRoman Kushnir2013-11-112-0/+4
* | | | | | | | Merge pull request #12857 from kuldeepaggarwal/f-indentationXavier Noria2013-11-111-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | updated documentation for IntegerKuldeep Aggarwal2013-11-121-3/+3
* | | | | | | | | Merge pull request #12555 from EtienneLem/responsive-static-pagesGuillermo Iguaran2013-11-114-33/+54
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make static error pages responsiveEtienne Lemay2013-11-114-33/+54
|/ / / / / / / /
* | | | | | | | Merge pull request #12854 from kuldeepaggarwal/f-indentationRafael Mendonça França2013-11-114-14/+18
|\| | | | | | |
| * | | | | | | documentation updated for Hashes [ci skip]KD2013-11-114-14/+18
* | | | | | | | Merge pull request #12748 from dm1try/fix_counter_cache_for_through_associationYves Senn2013-11-113-1/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent the counter cache from being decremented twicedm1try2013-11-113-1/+17
|/ / / / / / / /
* | | | | | | | Merge pull request #12815 from Adam89/patch-1Xavier Noria2013-11-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update security.mdAdam2013-11-081-1/+1
* | | | | | | | | Merge pull request #12425 from senny/mysql_booleansYves Senn2013-11-114-6/+104
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Unifies mysql and mysql2 casting of booleans.Yves Senn2013-11-114-9/+16
| * | | | | | | | test cases to describe the MySQL boolean behavior.Yves Senn2013-11-111-0/+91
|/ / / / / / / /
* | | | | | | | Do not count "SHOW CREATE TABLE" queries when testing against mysqlAkira Matsuda2013-11-111-1/+1
* | | | | | | | Merge pull request #12847 from jipe/masterXavier Noria2013-11-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed typo in migrations guideJimmy Petersen2013-11-111-1/+1
|/ / / / / / / /
* | | | | | | | tidy Active Record CHANGELOG. [ci skip].Yves Senn2013-11-111-1/+3
* | | | | | | | Avoid sorting an Array including objects from different ClassesAkira Matsuda2013-11-111-1/+1
* | | | | | | | Load test fixtures where data are neededAkira Matsuda2013-11-111-0/+2
* | | | | | | | Merge pull request #12834 from dredozubov/has_one_association_replacementYves Senn2013-11-113-4/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes problem with replacing has_one association record with itselfDenis Redozubov2013-11-113-4/+26
* | | | | | | | | A tiny grammatical fixAkira Matsuda2013-11-111-1/+1
* | | | | | | | | Merge pull request #12844 from akalyaev/bugfix/12835-autoload-change-column-d...Rafael Mendonça França2013-11-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | autoload ChangeColumnDefinition (Fixes #12835)Anton Kalyaev2013-11-111-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12843 from DeltaKilo/css_fixRafael Mendonça França2013-11-118-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix missing line and shadow on static error pages [ci skip]Dmitry Korotkov2013-11-118-0/+20
| |/ / / / / / / /
* | | | | | | | | Merge pull request #12842 from kuldeepaggarwal/array_splitGuillermo Iguaran2013-11-111-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Speed up Array#splitKD2013-11-111-3/+3
* | | | | | | | | Merge pull request #12841 from kuldeepaggarwal/in-group-documentationYves Senn2013-11-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |