aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Spelling and Grammar checksAkshay Vishnoi2013-12-128-12/+12
* Merge pull request #13032 from kuldeepaggarwal/after_touch_documentationYves Senn2013-12-121-0/+49
|\
| * [ci skip] added after_touch callback documentationKuldeep Aggarwal2013-12-121-0/+49
* | Get rid of hack for freezing time on AR testsCarlos Antonio da Silva2013-12-122-23/+5
* | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-123-12/+14
* | Merge pull request #13288 from dvsuresh/fix_typoDamien Mathieu2013-12-121-1/+1
|\ \
| * | Fix typo in action_controller responder.rbdvsuresh2013-12-121-1/+1
* | | Merge pull request #13287 from aayushkhandelwal11/typo_rectifiedYves Senn2013-12-113-5/+5
|\ \ \
| * | | typos rectified lifecycle => life cycleAayush khandelwal2013-12-123-5/+5
* | | | JSON: speed up date/time encodingJeremy Kemper2013-12-111-24/+19
* | | | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-113-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | typos rectified [ci skip]Aayush khandelwal2013-12-123-3/+3
| |/ /
* | | Merge pull request #13279 from misfo/session-fetch-that-behaves-like-hash-fetchRafael Mendonça França2013-12-113-14/+11
|\ \ \
| * | | Update CHANGELOG entry for Session#fetchTrent Ogren2013-12-111-3/+1
| * | | Make ActionDispatch::Request::Session#fetch behave like Hash#fetchTrent Ogren2013-12-112-11/+10
* | | | Merge pull request #13281 from waynn/patch-5Rafael Mendonça França2013-12-111-1/+1
|\ \ \ \
| * | | | test description uses "disable" when it should be "disabled"Waynn Lue2013-12-111-1/+1
|/ / / /
* | | | Merge pull request #13280 from waynn/patch-4Rafael Mendonça França2013-12-111-1/+1
|\ \ \ \
| * | | | value is "disabled" not "disable"Waynn Lue2013-12-111-1/+1
* | | | | Remove not necessary file, move constants to the file they are usedCarlos Antonio da Silva2013-12-113-8/+8
* | | | | Merge pull request #13264 from laurocaetano/fix_dynamic_finder_with_reserved_...Rafael Mendonça França2013-12-113-2/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent invalid code when using dynamic finders with Ruby's reserved words.Lauro Caetano2013-12-113-2/+16
| | |/ / | |/| |
* | | | Merge branch 'support-deprecated-finders'Rafael Mendonça França2013-12-118-48/+66
|\ \ \ \
| * | | | Move the parameter normalization to the initialize methodRafael Mendonça França2013-12-111-4/+5
| * | | | Revert the whole refactoring in the association builder classes.Rafael Mendonça França2013-12-118-47/+64
| | |/ / | |/| |
* / | | Nodoc missing number helper classes in AS [ci skip]Carlos Antonio da Silva2013-12-113-4/+2
|/ / /
* | | Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"Rafael Mendonça França2013-12-111-1/+2
* | | Mark the arguments needed by activerecord-deprecated_finders with a TODORafael Mendonça França2013-12-114-2/+20
* | | Revert "Merge pull request #12518 from vipulnsward/remove_count_options"Rafael Mendonça França2013-12-115-17/+20
* | | Bring back the valid_options class accessorRafael Mendonça França2013-12-116-9/+14
* | | Merge pull request #13276 from aayushkhandelwal11/change_to_keyRafael Mendonça França2013-12-111-2/+1
|\ \ \
| * | | removing multiple check conditions to single check conditionAayush khandelwal2013-12-111-2/+1
| |/ /
* | | Merge pull request #13273 from robertomiranda/test-remove-requireGuillermo Iguaran2013-12-111-1/+0
|\ \ \
| * | | Remove require 'models/administrator', Administrator is not used in secure pa...robertomiranda2013-12-111-1/+0
* | | | Merge pull request #13270 from aayushkhandelwal11/typosDamien Mathieu2013-12-112-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | typo rectified [skip ci]Aayush khandelwal2013-12-112-2/+2
|/ / /
* | | Merge pull request #13260 from arunagw/using-parallelize_meAaron Patterson2013-12-101-6/+3
|\ \ \
| * | | Using parallelize_me! to parallelize isolated testArun Agrawal2013-12-101-6/+3
* | | | Merge pull request #12699 from drogus/fix-mounting-engine-in-resourcesPiotr Sarnacki2013-12-103-2/+18
|\ \ \ \
| * | | | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
|/ / / /
* | | | Revert "Rename not Ruby files to .tt"Santiago Pastorino2013-12-1016-0/+0
* | | | Merge pull request #13258 from semaperepelitsa/docsDamien Mathieu2013-12-101-1/+1
|\ \ \ \
| * | | | Fix typo in docs, missing colon in Symbol literal [ci skip]Semyon Perepelitsa2013-12-111-1/+1
|/ / / /
* | | | Merge pull request #13257 from eshira/optimize-gsubJosé Valim2013-12-101-1/+2
|\ \ \ \
| * | | | Replace with gsub! in ActiveSupport::Inflector.Elben Shira2013-12-101-1/+2
|/ / / /
* | | | Rename not Ruby files to .ttSantiago Pastorino2013-12-1016-0/+0
* | | | Merge pull request #13253 from strzalek/variants-inline2David Heinemeier Hansson2013-12-103-4/+65
|\ \ \ \
| * | | | Inline variants syntaxŁukasz Strzałkowski2013-12-103-3/+63
| * | | | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
* | | | | make `collect_deprecations` available.Yves Senn2013-12-101-11/+10