Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2013-03-30 | 306 | -1613/+4285 |
|\ | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 44 | -208/+274 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | | adds the API home page to the gemspec, needed for doc:rails | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | typo | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | registers the new doc:rails behaviour in the changelog | Xavier Noria | 2013-03-30 | 1 | -0/+5 |
| | | | |||||
| * | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependency | Xavier Noria | 2013-03-30 | 3 | -1/+10 |
| | | | |||||
| * | | unifies API generation | Xavier Noria | 2013-03-30 | 3 | -54/+35 |
| | | | |||||
| * | | moves RDOC_MAIN.rdoc to railties | Xavier Noria | 2013-03-30 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The goal of these refactors is to have the same code generating edge and doc:rails APIs, and the rails gem is not available in LOAD_PATHS because it has no lib directory. | ||||
| * | | encapsulates API generation in Rails::API::Task | Xavier Noria | 2013-03-30 | 4 | -84/+197 |
| | | | |||||
| * | | changes the RDoc title of the API | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Nowadays the documentation of Ruby on Rails is more than the API. | ||||
| * | | Merge pull request #9998 from neerajdotname/association-doc | Steve Klabnik | 2013-03-29 | 1 | -2/+2 |
| |\ \ | | | | | | | | | fixes for association doc | ||||
| | * | | Do not use deprecate method [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix broken sentence [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+1 |
| |/ / | |||||
| * | | removes bindir from the rails gemspec | Xavier Noria | 2013-03-29 | 1 | -3/+1 |
| | | | | | | | | | | | | Nowadays the rails gem itself has no executables. | ||||
| * | | removes activerecord/examples/associations.png | Xavier Noria | 2013-03-29 | 2 | -6/+0 |
| | | | | | | | | | | | | This seems to be a legacy file, I cannot find any place where it is used. | ||||
| * | | Merge pull request #9989 from robertomiranda/group-assets | Guillermo Iguaran | 2013-03-28 | 1 | -12/+11 |
| |\ \ | | | | | | | | | Update Gemfile since group assets doesn't exist anymore in Gemfile | ||||
| | * | | Update Gemfile since group assets doesn't exist anymore in Gemfile | robertomiranda | 2013-03-28 | 1 | -12/+11 |
| | | | | |||||
| * | | | Merge pull request #9987 from robertomiranda/group-assets | Rafael Mendonça França | 2013-03-28 | 1 | -2/+3 |
| |\| | | | | | | | | | | Update Bundler require in getting started application | ||||
| | * | | Update Bundler require in getting started application | robertomiranda | 2013-03-28 | 1 | -2/+3 |
| |/ / | |||||
| * | | Update the call to Bundler.require in application.rb since assets group ↵ | Guillermo Iguaran | 2013-03-28 | 1 | -2/+3 |
| | | | | | | | | | | | | doesn't exist anymore in Gemfile | ||||
| * | | Add better comments to assets gems | Guillermo Iguaran | 2013-03-28 | 1 | -9/+22 |
| | | | |||||
| * | | Merge pull request #9984 from ranjaykrishna/col-prob | Rafael Mendonça França | 2013-03-28 | 3 | -4/+8 |
| |\ \ | | | | | | | | | valid_type? added to super class abstract_adapter | ||||
| | * | | added comments to test_invalid_type in sqlite3 adapter test and added ↵ | Ranjay Krishna | 2013-03-28 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | valid_type? method to abstract_adapter.rb and removed unnecessary method from sqlite3 adapter | ||||
| * | | | Merge pull request #9982 from prathamesh-sonpatki/railite-typo | Carlos Antonio da Silva | 2013-03-28 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Fix typo | ||||
| | * | | | Fix typo | Prathamesh Sonpatki | 2013-03-28 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | contrib guide: documents guidelines for running the test suite | Xavier Noria | 2013-03-28 | 1 | -0/+11 |
| | | | | |||||
| * | | | contrib guide: documents how to generate a --dev application | Xavier Noria | 2013-03-28 | 1 | -0/+16 |
| | | | | |||||
| * | | | Merge pull request #9977 from vipulnsward/fix_column_test_typo | Rafael Mendonça França | 2013-03-28 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |/| | | anual_salary => annual_salary | ||||
| | * | | anual_salary => annual_salary | Vipul A M | 2013-03-28 | 1 | -3/+3 |
| |/ / | |||||
| * | | Merge pull request #9974 from prathamesh-sonpatki/change_log | Steve Klabnik | 2013-03-28 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Removed unused variable in proc [ci skip] | ||||
| | * | | Removed unused variable in proc | Prathamesh Sonpatki | 2013-03-28 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | * This unused variable is already removed from the code here. d18e8b1a3839c5c214e96c7e37e0d86febe15f99 * So removing it from CHANGELOG to be consistent with code | ||||
| * | | Merge pull request #9972 from divineforest/fix-overriden-typo | Rafael Mendonça França | 2013-03-28 | 4 | -5/+5 |
| |\ \ | | | | | | | | | Fix typo: overriden => overriDDen | ||||
| | * | | Fix typo: overriden => overriDDen | Alexander Balashov | 2013-03-28 | 4 | -5/+5 |
| | | | | |||||
| * | | | Merge pull request #9973 from prathamesh-sonpatki/AR-typos | Rafael Mendonça França | 2013-03-28 | 3 | -5/+5 |
| |\ \ \ | | | | | | | | | | | Fixed typos in ActiveRecord | ||||
| | * | | | Fixed typos in ActiveRecord | Prathamesh Sonpatki | 2013-03-28 | 3 | -5/+5 |
| |/ / / | |||||
| * | | | Merge pull request #9970 from divineforest/fix-typo | Rafael Mendonça França | 2013-03-28 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Fix typo | ||||
| | * | | | Fix typo | Alexander Balashov | 2013-03-28 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Use snake case variable names, stick with the convention | Carlos Antonio da Silva | 2013-03-28 | 1 | -13/+13 |
| | | | | |||||
| * | | | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_cases | Carlos Antonio da Silva | 2013-03-28 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | | | Refactored to remove unused loop variable | ||||
| | * | | | Refactored to remove unused variable | Anupam Choudhury | 2013-03-28 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #9963 from obrie/fix/after_create_updates | Carlos Antonio da Silva | 2013-03-28 | 2 | -1/+17 |
| |\ \ \ \ | | |_|/ / | |/| | | | Fix updates not working within after_create hooks | ||||
| | * | | | Fix updates not working within after_create hooks | Aaron Pfeifer | 2013-03-27 | 2 | -1/+17 |
| | | | | | |||||
| * | | | | Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammar | Carlos Antonio da Silva | 2013-03-28 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | Fixed grammar | ||||
| | * | | | Fixed grammar | Anupam Choudhury | 2013-03-28 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn] | Xavier Noria | 2013-03-28 | 2 | -0/+12 |
| | | | | |||||
| * | | | Add coffee-rails and javascript runtime to gemfile if skip_javascript is | Rafael Mendonça França | 2013-03-28 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | provided | ||||
| * | | | Merge pull request #9944 from where/rebased-fulltext-spacial | Rafael Mendonça França | 2013-03-27 | 13 | -37/+108 |
| |\ \ \ | | | | | | | | | | | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL | ||||
| | * | | | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL. | Ken Mazaika | 2013-03-27 | 13 | -37/+108 |
| |/ / / | |||||
| * | | | Merge pull request #9964 from where/using-schema-dump | Rafael Mendonça França | 2013-03-27 | 3 | -2/+11 |
| |\ \ \ | | |/ / | |/| | | Dump the 'using' options for a SQL index into the schema. | ||||
| | * | | Dump the 'using' options for a SQL index into the schema. | Ken Mazaika | 2013-03-27 | 3 | -2/+11 |
| |/ / |