aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | fix a typo [ci skip]Vijay Dev2012-02-011-1/+1
* | | | | | | | Merge pull request #4825 from sikachu/master-fix-plugin-newJosé Valim2012-02-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix broken test introduced from #4814Prem Sichanugrist2012-02-011-1/+1
* | | | | | | | | Merge pull request #4826 from kennyj/fix_4737-2José Valim2012-02-012-8/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix GH #4737. Missing helper file (LoadError) in mountable plugin.kennyj2012-02-022-8/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-0111-24/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | fixes the plus sign properly [ci skip]Vijay Dev2012-02-011-1/+1
| * | | | | | | | Revert "fixing text to match what is being displayed"Vijay Dev2012-02-011-1/+1
| * | | | | | | | escape plus sign in "Rails 2.3+" to fix markupdaniely2012-02-011-1/+1
| * | | | | | | | Improve readonly examples and optimistic locking docsCarlos Antonio da Silva2012-01-312-9/+11
| * | | | | | | | Improve ar associations habtm docs a bitCarlos Antonio da Silva2012-01-311-5/+2
| * | | | | | | | Merge branch 'master' of github.com:lifo/docrailsPatrick Davey2012-01-311-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed typo. "from" should be "form".Ying Tsen Hong2012-01-301-1/+1
| * | | | | | | | | fixing text to match what is being displayedPatrick Davey2012-01-311-1/+1
| |/ / / / / / / /
| * | | | | | | | Fixing some double quotes that should be single quotesCarol Nichols2012-01-291-2/+2
| * | | | | | | | Update .travis.ymlben2012-01-301-1/+0
| * | | | | | | | https://github.com/lifo/docrails/blob/master/.travis.ymlben2012-01-301-0/+1
| * | | | | | | | Sorry for editing this file.Meck2012-01-301-1/+1
| * | | | | | | | Update README.rdocMeck2012-01-301-1/+1
| * | | | | | | | Improve active record associations guide a bitCarlos Antonio da Silva2012-01-281-2/+2
| * | | | | | | | Whitespace only: Use single newline at end of file.Brook Riggio2012-01-273-3/+2
| * | | | | | | | Updates documentaton to indicate that :expires_in can be used with all cache ...dev2012-01-261-1/+2
| * | | | | | | | [ci skip] More docs for ActiveSupport::MessageEncryptorDaniel Fone2012-01-261-0/+14
* | | | | | | | | Merge pull request #4814 from guilleiguaran/remove-ruby-debugger-methodSantiago Pastorino2012-02-012-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove ruby_debugger_gemfile_entry from app_base, we can just put ruby-debug1...Guillermo Iguaran2012-02-012-5/+1
* | | | | | | | | | Merge pull request #4821 from carlosantoniodasilva/strict-validationJosé Valim2012-02-013-11/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Generate strict validation error messages with attribute nameCarlos Antonio da Silva2012-02-013-11/+19
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4818 from arunagw/build_fix_isolatedJosé Valim2012-02-011-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Build fix when running isolated testArun Agrawal2012-02-011-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4433 from carlosantoniodasilva/html-escape-onceJosé Valim2012-02-014-2/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move escaping regexps to constantsCarlos Antonio da Silva2012-02-011-2/+4
| * | | | | | | | | Move escape_once logic to ERB::Util, where it belongs toCarlos Antonio da Silva2012-02-014-1/+32
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4672 from carlosantoniodasilva/av-url-helperJosé Valim2012-02-012-31/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor button_to to avoid calling method#to_s twiceCarlos Antonio da Silva2012-01-251-23/+13
| * | | | | | | | | Change OrderedHash with array options to simple hash usageCarlos Antonio da Silva2012-01-251-8/+8
* | | | | | | | | | Merge pull request #4808 from route/mb_chars_as_jsonJosé Valim2012-01-312-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added as_json method for multibyte stringsDmitriy Vorotilin2012-02-012-0/+7
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4799 from arunagw/warning_fixed_for_indentationsAaron Patterson2012-01-311-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | warning removed: mismatched indentationsArun Agrawal2012-01-311-1/+1
* | | | | | | | | Revert "Merge pull request #4746 from jenslukowski/issue4718"Aaron Patterson2012-01-312-16/+1
* | | | | | | | | Merge pull request #4805 from xuanxu/none_and_null_object_patternJon Leighton2012-01-316-1/+71
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Added `none` query method to return zero records.Juanjo Bazán2012-01-316-1/+71
* | | | | | | | | QueryCache will just dup an AR::Result, AR::Result can deep copyAaron Patterson2012-01-312-9/+21
* | | | | | | | | always return the result set from select_allAaron Patterson2012-01-312-2/+2
* | | | | | | | | made the result set object act more like an arrayAaron Patterson2012-01-315-4/+24
* | | | | | | | | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | run direcly $0 if rake invoked by Windows batch file.arton2012-01-291-1/+5
* | | | | | | | | | Merge pull request #4742 from petervandenabeele/masterAaron Patterson2012-01-311-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set default_timezone explicitly for a test in activerecord/../base_test.rbPeter Vandenabeele2012-01-291-0/+3
* | | | | | | | | | | Merge pull request #4746 from jenslukowski/issue4718Aaron Patterson2012-01-312-1/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |