aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactor File.expand_path usage to remove additional File.joinAlex Johnson2013-11-053-3/+3
* BACKTRACE environment variable to show unfiltered backtraces.Yves Senn2013-11-043-6/+48
* Merge pull request #12750 from arunagw/webconsole-invite-onlyGuillermo Iguaran2013-11-033-15/+0
|\
| * No web-console for nowArun Agrawal2013-11-033-15/+0
|/
* Line up the comments for aestheticsDavid Heinemeier Hansson2013-11-031-5/+5
* AestheticsDavid Heinemeier Hansson2013-11-031-22/+30
* Code style for privacy indentionDavid Heinemeier Hansson2013-11-031-8/+8
* Ensure backwards compability after the #deep_munge extractionDavid Heinemeier Hansson2013-11-031-0/+10
* Add test verifying that you can only sort ARs of the same typeDavid Heinemeier Hansson2013-11-021-1/+7
* Revert "ActiveRecord::Base#<=> has been removed. Primary keys may not be in ...David Heinemeier Hansson2013-11-023-12/+16
* Delegate #rewhere to all on the class like all other relation methodsDavid Heinemeier Hansson2013-11-022-1/+5
* Move documentation around a bitDavid Heinemeier Hansson2013-11-021-4/+7
* Merge pull request #12747 from yury/explicit-enum-valuesDavid Heinemeier Hansson2013-11-024-1/+15
|\
| * Explicit mapping for enumYury Korolev2013-11-024-1/+15
* | Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, na...David Heinemeier Hansson2013-11-023-0/+52
* | unscope now works on default_scope after 94924dc32baf78f13e289172534c2e71c9c8...Rafael Mendonça França2013-11-023-9/+9
|/
* Add a test case for the scope enum addsDavid Heinemeier Hansson2013-11-021-0/+4
* Extend ActiveRecord::Base#cache_key to take an optional list of timestamp att...David Heinemeier Hansson2013-11-024-2/+27
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-11-0210-94/+48
|\
| * Use an already existing fixtureCarlos Antonio da Silva2013-11-021-1/+1
| * Fix to work on Ruby 1.9.3, example and changelog improvementsCarlos Antonio da Silva2013-11-024-34/+34
| * Improve wording in AC::ParameterMissing error messageGuillermo Iguaran2013-11-021-1/+1
| * Update guides welcome page to point to version 3.2.15 [ci skip]Carlos Antonio da Silva2013-11-021-1/+1
| * Revert "Merge pull request #9660 from sebasoga/change_strong_parameters_requi...Guillermo Iguaran2013-11-025-57/+11
* | Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed th...David Heinemeier Hansson2013-11-023-0/+14
|/
* Added ActiveRecord::Base#enum for declaring enum attributes where the values ...David Heinemeier Hansson2013-11-027-2/+128
* Merge pull request #12686 from kryzhovnik/masterCarlos Antonio da Silva2013-11-021-6/+6
|\
| * Minor doc fix of ActiveModel::Naming.Andrey Samsonov2013-10-291-6/+6
* | Merge pull request #9660 from sebasoga/change_strong_parameters_require_behav...Guillermo Iguaran2013-11-015-11/+57
|\ \
| * | Change ActionController::Parameters#require behavior when value is emptySebastian Sogamoso2013-03-115-11/+57
* | | Fix wrong behavior where associations with dependent: :destroy optionsRafael Mendonça França2013-11-013-10/+7
* | | Merge pull request #12739 from laurocaetano/remove_warnings_for_ruby_trunkRafael Mendonça França2013-11-015-6/+6
|\ \ \
| * | | remove warnings on ruby trunklaurocaetano2013-11-015-6/+6
|/ / /
* | | Test with the right associationRafael Mendonça França2013-11-011-3/+3
* | | Merge pull request #12733 from robin850/fix-railties-buildRafael Mendonça França2013-11-015-6/+6
|\ \ \
| * | | Fix some failing tests for Rails::PathsRobin Dupret2013-11-012-3/+3
| * | | Set the destination_root for pluginsRobin Dupret2013-11-011-0/+1
| * | | Remove "circular require considered harmful" errorRobin Dupret2013-11-012-3/+2
* | | | Merge pull request #12735 from linstula/fix-typo-in-responder-commentRafael Mendonça França2013-11-011-1/+1
|\ \ \ \
| * | | | Fix typo in method description in Responder classLin Reid2013-11-011-1/+1
* | | | | Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunkRafael Mendonça França2013-11-0119-31/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | shadowing variable warning removedArun Agrawal2013-11-011-1/+1
| * | | | More Warnings removed for ruby trunkArun Agrawal2013-11-0119-30/+30
* | | | | :bomb:Rafael Mendonça França2013-11-011-1/+1
* | | | | Use consistent order of the argumentsRafael Mendonça França2013-11-011-9/+9
|/ / / /
* | | | Merge pull request #12729 from arunagw/build-fixed-ruby193Rafael Mendonça França2013-11-012-2/+8
|\ \ \ \
| * | | | Passing args for gemfile entryArun Agrawal2013-11-012-2/+8
| |/ / /
* | | | Merge pull request #12732 from razielgn/additional-rbx-depRafael Mendonça França2013-11-011-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Added rubysl-rexml to Rubinius deps.Federico Ravasio2013-11-011-0/+1
|/ / /
* | | Merge pull request #12727 from arunagw/aa-warnings-removed-ruby-trunkSantiago Pastorino2013-11-019-29/+29
|\ \ \