| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Fix broken tests | Santiago Pastorino | 2012-03-10 | 2 | -1/+4 |
* | | | | Merge pull request #5371 from jsl/fix_actionmailer_tests | José Valim | 2012-03-10 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Fix actionmailer tests broken by #4751a69 | Justin S. Leitgeb | 2012-03-10 | 1 | -1/+1 |
|/ / / / |
|
* | | | | AbstractController.action_methods should return a Set | Santiago Pastorino | 2012-03-10 | 2 | -3/+4 |
* | | | | Merge pull request #5367 from carlosantoniodasilva/middleware-api | Santiago Pastorino | 2012-03-10 | 5 | -24/+67 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Change api_only to http_only | Carlos Antonio da Silva | 2012-03-10 | 5 | -21/+20 |
| * | | | Add some docs for MiddlewareStackProxy methods and api_only! | Carlos Antonio da Silva | 2012-03-10 | 3 | -5/+49 |
|/ / / |
|
* | | | Merge pull request #5364 from carlosantoniodasilva/active-model-serialization... | José Valim | 2012-03-10 | 2 | -24/+18 |
|\ \ \ |
|
| * | | | Rename variable to avoid using name "include" | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+4 |
| * | | | Remove Array#wrap usage in AMo serialization | Carlos Antonio da Silva | 2012-03-09 | 1 | -2/+1 |
| * | | | Make sure serializable hash with :include always returns string keys | Carlos Antonio da Silva | 2012-03-09 | 2 | -15/+14 |
|/ / / |
|
* | | | Install latest bundler on Travis. | José Valim | 2012-03-09 | 1 | -0/+2 |
* | | | Bump bundler dependency. | José Valim | 2012-03-09 | 1 | -1/+1 |
* | | | Merge pull request #5356 from carlosantoniodasilva/rake-test-system | José Valim | 2012-03-09 | 4 | -106/+98 |
|\ \ \ |
|
| * | | | Use one system call whenever possible, group rake and Dir.chdir calls | Carlos Antonio da Silva | 2012-03-08 | 4 | -106/+98 |
* | | | | Merge pull request #5352 from avakhov/ar_finder_sql_uniq_ids | José Valim | 2012-03-09 | 2 | -1/+8 |
|\ \ \ \ |
|
| * | | | | In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] c... | Alexey Vakhov | 2012-03-09 | 2 | -1/+8 |
|/ / / / |
|
* | | | | Merge pull request #5351 from shanna/master | José Valim | 2012-03-08 | 1 | -0/+1 |
|\ \ \ \ |
|
| * | | | | Added missing ActiveModel::Naming dependency. | Shane Hanna | 2012-03-09 | 1 | -0/+1 |
* | | | | | Minor changelog fixes [ci skip] | Vijay Dev | 2012-03-09 | 1 | -1/+1 |
* | | | | | Merge pull request #5349 from rafaelfranca/changelog-fix | Vijay Dev | 2012-03-08 | 7 | -10/+59 |
|\ \ \ \ \ |
|
| * | | | | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 7 | -10/+59 |
| |/ / / / |
|
* | | | | | Merge pull request #5348 from rafaelfranca/fix-warning | Vijay Dev | 2012-03-08 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Remove warning of unused variable | Rafael Mendonça França | 2012-03-08 | 1 | -1/+1 |
|/ / / / |
|
* | | | | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 |
* | | | | make active_connection? return true only if there is an open connection in us... | Aaron Patterson | 2012-03-08 | 2 | -7/+39 |
|/ / / |
|
* | | | fix incorrect changelog headings [ci skip]. | Vijay Dev | 2012-03-09 | 3 | -25/+27 |
* | | | changelog updates for Rails 4 [ci skip] | Vijay Dev | 2012-03-09 | 4 | -1/+27 |
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-09 | 11 | -30/+81 |
|\ \ \ |
|
| * | | | Revert "Add rails glossary of common terms & concepts" | Vijay Dev | 2012-03-08 | 2 | -428/+0 |
| * | | | copy edits [ci skip] | Vijay Dev | 2012-03-07 | 1 | -2/+2 |
| * | | | Merge pull request #88 from kevingriffin/master | Vijay Dev | 2012-03-07 | 1 | -5/+5 |
| |\ \ \ |
|
| | * | | | Correct it's/its usage. | Kevin Griffin | 2012-03-06 | 1 | -5/+5 |
| * | | | | Improve docs for attr_accessible|protected related to Hash#except|slice | Carlos Antonio da Silva | 2012-03-06 | 1 | -8/+10 |
| * | | | | Add some docs for ActionController::Base.without_modules | Carlos Antonio da Silva | 2012-03-06 | 1 | -0/+10 |
| * | | | | Left off a : when specifying the :namespace option for a :controller | coreyhaines | 2012-03-06 | 1 | -1/+1 |
| * | | | | In a nested resource route, the parent resource param is <resource_name>_id | coreyhaines | 2012-03-06 | 1 | -8/+8 |
| |/ / / |
|
| * | | | Merge pull request #86 from bschaeffer/ar-doc-fix | Vijay Dev | 2012-03-06 | 1 | -2/+2 |
| |\ \ \ |
|
| | * | | | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-05 | 1 | -2/+2 |
| * | | | | Fix typo in isolated engine docs | Caius Durling | 2012-03-06 | 1 | -1/+1 |
| * | | | | [instrumentation guide] Add introduction + basic outline | Ryan Bigg | 2012-03-05 | 1 | -0/+39 |
| * | | | | Merge branch 'master' of github.com:lifo/docrails | adman65 | 2012-03-05 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | Fix typo in asset pipeline guide | Matthew Conway | 2012-03-05 | 1 | -1/+1 |
| | |/ / / |
|
| * / / / | Add rails glossary of common terms & concepts | adman65 | 2012-03-05 | 2 | -0/+428 |
| |/ / / |
|
| * | | | Fixed a slightly misleading equivalent SQL code on the 3.2 query interface. | Swanand Pagnis | 2012-03-05 | 1 | -1/+1 |
| * | | | Bump "latest version" from 3.2.1 to 3.2.2 in upgrading rails guide | Carlos Antonio da Silva | 2012-03-04 | 1 | -2/+2 |
| * | | | typo | Mikhail Dieterle | 2012-03-04 | 1 | -1/+1 |
* | | | | Merge pull request #5287 from nashby/hash-slice-extract | Aaron Patterson | 2012-03-08 | 2 | -8/+11 |
|\ \ \ \ |
|
| * | | | | refactor Hash#slice and Hash#extract! | Vasiliy Ermolovich | 2012-03-06 | 2 | -8/+11 |
* | | | | | Merge pull request #5306 from kennyj/fix_69c7f02 | José Valim | 2012-03-08 | 2 | -2/+2 |
|\ \ \ \ \ |
|