Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Extend ActiveRecord::Base#cache_key to take an optional list of timestamp att... | David Heinemeier Hansson | 2013-11-02 | 4 | -2/+27 | |
* | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2013-11-02 | 10 | -94/+48 | |
|\ \ \ | ||||||
| * | | | Use an already existing fixture | Carlos Antonio da Silva | 2013-11-02 | 1 | -1/+1 | |
| * | | | Fix to work on Ruby 1.9.3, example and changelog improvements | Carlos Antonio da Silva | 2013-11-02 | 4 | -34/+34 | |
| * | | | Improve wording in AC::ParameterMissing error message | Guillermo Iguaran | 2013-11-02 | 1 | -1/+1 | |
| * | | | Update guides welcome page to point to version 3.2.15 [ci skip] | Carlos Antonio da Silva | 2013-11-02 | 1 | -1/+1 | |
| * | | | Revert "Merge pull request #9660 from sebasoga/change_strong_parameters_requi... | Guillermo Iguaran | 2013-11-02 | 5 | -57/+11 | |
* | | | | Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed th... | David Heinemeier Hansson | 2013-11-02 | 3 | -0/+14 | |
|/ / / | ||||||
* | | | Added ActiveRecord::Base#enum for declaring enum attributes where the values ... | David Heinemeier Hansson | 2013-11-02 | 7 | -2/+128 | |
* | | | Merge pull request #12686 from kryzhovnik/master | Carlos Antonio da Silva | 2013-11-02 | 1 | -6/+6 | |
|\ \ \ | ||||||
| * | | | Minor doc fix of ActiveModel::Naming. | Andrey Samsonov | 2013-10-29 | 1 | -6/+6 | |
* | | | | Merge pull request #9660 from sebasoga/change_strong_parameters_require_behav... | Guillermo Iguaran | 2013-11-01 | 5 | -11/+57 | |
|\ \ \ \ | ||||||
| * | | | | Change ActionController::Parameters#require behavior when value is empty | Sebastian Sogamoso | 2013-03-11 | 5 | -11/+57 | |
* | | | | | Fix wrong behavior where associations with dependent: :destroy options | Rafael Mendonça França | 2013-11-01 | 3 | -10/+7 | |
* | | | | | Merge pull request #12739 from laurocaetano/remove_warnings_for_ruby_trunk | Rafael Mendonça França | 2013-11-01 | 5 | -6/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | remove warnings on ruby trunk | laurocaetano | 2013-11-01 | 5 | -6/+6 | |
|/ / / / / | ||||||
* | | | | | Test with the right association | Rafael Mendonça França | 2013-11-01 | 1 | -3/+3 | |
* | | | | | Merge pull request #12733 from robin850/fix-railties-build | Rafael Mendonça França | 2013-11-01 | 5 | -6/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix some failing tests for Rails::Paths | Robin Dupret | 2013-11-01 | 2 | -3/+3 | |
| * | | | | | Set the destination_root for plugins | Robin Dupret | 2013-11-01 | 1 | -0/+1 | |
| * | | | | | Remove "circular require considered harmful" error | Robin Dupret | 2013-11-01 | 2 | -3/+2 | |
* | | | | | | Merge pull request #12735 from linstula/fix-typo-in-responder-comment | Rafael Mendonça França | 2013-11-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix typo in method description in Responder class | Lin Reid | 2013-11-01 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunk | Rafael Mendonça França | 2013-11-01 | 19 | -31/+31 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | shadowing variable warning removed | Arun Agrawal | 2013-11-01 | 1 | -1/+1 | |
| * | | | | | | More Warnings removed for ruby trunk | Arun Agrawal | 2013-11-01 | 19 | -30/+30 | |
* | | | | | | | :bomb: | Rafael Mendonça França | 2013-11-01 | 1 | -1/+1 | |
* | | | | | | | Use consistent order of the arguments | Rafael Mendonça França | 2013-11-01 | 1 | -9/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #12729 from arunagw/build-fixed-ruby193 | Rafael Mendonça França | 2013-11-01 | 2 | -2/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Passing args for gemfile entry | Arun Agrawal | 2013-11-01 | 2 | -2/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #12732 from razielgn/additional-rbx-dep | Rafael Mendonça França | 2013-11-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Added rubysl-rexml to Rubinius deps. | Federico Ravasio | 2013-11-01 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12727 from arunagw/aa-warnings-removed-ruby-trunk | Santiago Pastorino | 2013-11-01 | 9 | -29/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | Warnings removed for ruby trunk | Arun Agrawal | 2013-11-01 | 9 | -29/+29 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #12713 from utenmiki/document | Yves Senn | 2013-11-01 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add Rdoc document for Array#forty_two | utenmiki | 2013-10-31 | 1 | -0/+2 | |
* | | | | | | Merge pull request #12722 from razielgn/update-travis-rbx | Rafael Mendonça França | 2013-10-31 | 2 | -2/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Added Rubinius 2 specific dependencies. | Federico Ravasio | 2013-10-31 | 1 | -0/+6 | |
| * | | | | | | Updated Rubinius version to 2.1.1 | Federico Ravasio | 2013-10-31 | 1 | -2/+2 | |
* | | | | | | | gemfile entries can be added to the app builder | Aaron Patterson | 2013-10-31 | 2 | -3/+51 | |
|/ / / / / / | ||||||
* | | | | | | forgot to add the test. orz :cry: | Aaron Patterson | 2013-10-31 | 1 | -0/+50 | |
* | | | | | | clean up some warnings on trunk ruby | Aaron Patterson | 2013-10-31 | 4 | -4/+4 | |
* | | | | | | add filters for gemfile entries | Aaron Patterson | 2013-10-31 | 1 | -3/+9 | |
* | | | | | | Merge pull request #12712 from robin850/fix-build | Aaron Patterson | 2013-10-31 | 2 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Require time before monkey-patching it | Robin Dupret | 2013-10-31 | 2 | -1/+1 | |
* | | | | | | | Merge pull request #12107 from kares/master | Rafael Mendonça França | 2013-10-31 | 2 | -5/+13 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | `export AR_JDBC=true` on travis-ci as a *before_install* (but on jruby only) | kares | 2013-09-03 | 1 | -0/+1 | |
| * | | | | | | | allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`) | kares | 2013-09-03 | 1 | -5/+12 | |
* | | | | | | | | Merge pull request #12704 from JuanitoFatas/routing | Rafael Mendonça França | 2013-10-31 | 1 | -90/+93 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] Make all tables have Controller#Action, change a tense in sentence. | Juanito Fatas | 2013-10-31 | 1 | -90/+93 |