Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update AR and AP changelogs [ci skip] | Carlos Antonio da Silva | 2012-06-30 | 2 | -1/+15 |
| | |||||
* | Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-ap | Carlos Antonio da Silva | 2012-06-30 | 5 | -24/+33 |
|\ | | | | | Remove Active Model dependency from Action Pack | ||||
| * | Remove ActiveModel dependency from ActionPack | Guillermo Iguaran | 2012-06-30 | 5 | -24/+33 |
| | | | | | | | | | | | | | | | | ActiveModel is used in ActionPack for ActiveModel::Naming for a few, mostly optional aspects of ActionPack related to automatically converting an ActiveModel compliant object into a key for params and routing. It uses only three methods of ActiveModel (ActiveModel::Naming.route_key, ActiveModel::Naming.singular_route_key and ActiveModel::Naming.param_key). | ||||
* | | Merge pull request #6913 from lexmag/column_exists_options | Carlos Antonio da Silva | 2012-06-30 | 2 | -10/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add :default and :null options to column_exists? method Examples: column_exists?(:testings, :taggable_id, :integer, null: false) column_exists?(:testings, :taggable_type, :string, default: 'Photo') | ||||
| * | | Add more options to column_exists? method | Aleksey Magusev | 2012-06-30 | 2 | -10/+18 |
| | | | | | | | | | | | | Also fix failures in check options for nil | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-30 | 13 | -137/+385 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb | ||||
| * | | | Remove mention of `convert_key` now that it's been taken out in ↵ | Alex Nisnevich | 2012-06-28 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | 1eecd9483b0439ab4913beea36f0d0e2aa0518c7 | ||||
| * | | | Rails now uses the ActiveSupport BufferedLogger class | Chris Adams | 2012-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Instead of the standard Ruby logger | ||||
| * | | | update AR::FinderMethods#exists?(false) example [ci skip] | Francesco Rodriguez | 2012-06-28 | 1 | -5/+7 |
| | | | | |||||
| * | | | Mention effect of accepts_nested_attributes_for on association autosave ↵ | Chris Gunther | 2012-06-27 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | option [ci skip] | ||||
| * | | | corrected URLs and controller benchmark method call | Eric Carty-Fickes | 2012-06-26 | 1 | -3/+3 |
| | | | | |||||
| * | | | update ActiveModel::Name documentation [ci skip] | Francesco Rodriguez | 2012-06-25 | 1 | -1/+133 |
| | | | | |||||
| * | | | fix punctuation in activemodel/errors [ci skip] | Francesco Rodriguez | 2012-06-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed example in 1.2 so help will be defined as the text implies | Perry Smith | 2012-06-24 | 1 | -1/+7 |
| | | | | |||||
| * | | | update ActiveModel::Naming documentation | Francesco Rodriguez | 2012-06-23 | 1 | -7/+8 |
| | | | | |||||
| * | | | Merge pull request #104 from udaykadaboina/typofix | Francesco Rodríguez | 2012-06-23 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | fixed a typo [ci skip] | ||||
| | * | | | fixed another typo in edge guides | Uday Kadaboina | 2012-06-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fixed a typo | Uday Kadaboina | 2012-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | update ActiveModel::Model documentation [ci skip] | Francesco Rodriguez | 2012-06-23 | 1 | -16/+37 |
| | | | | | |||||
| * | | | | add description ActiveModel::StrictValidationField [ci skip] | Francesco Rodriguez | 2012-06-23 | 1 | -0/+10 |
| |/ / / | |||||
| * | | | update ActiveModel::Lint documentation [ci skip] | Francesco Rodriguez | 2012-06-22 | 1 | -22/+23 |
| | | | | |||||
| * | | | update ActiveModel::Errors#include? documentation [ci skip] | Francesco Rodriguez | 2012-06-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | add documentation and examples to ActiveModel::Errors [ci skip] | Francesco Rodriguez | 2012-06-22 | 1 | -4/+26 |
| | | | | |||||
| * | | | update ActiveModel::Errors documentation and minor fixes [ci skip] | Francesco Rodriguez | 2012-06-22 | 3 | -64/+103 |
| | | | | |||||
| * | | | update ActiveModel::Conversion documentation [ci skip] | Francesco Rodriguez | 2012-06-22 | 1 | -8/+21 |
| | | | | |||||
* | | | | Fix collation database task to use begin..rescue..end | Carlos Antonio da Silva | 2012-06-30 | 1 | -4/+6 |
| | | | | |||||
* | | | | Merge pull request #6908 from apotonick/av-prepare2 | José Valim | 2012-06-30 | 2 | -20/+13 |
|\ \ \ \ | | | | | | | | | | | Av prepare2 | ||||
| * | | | | removing the AV::Base.helpers class attribute as it is not needed. | Nick Sutterer | 2012-06-29 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | remove AV.prepare and move all helper-related logic into the controller. ↵ | Nick Sutterer | 2012-06-29 | 2 | -19/+13 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | this decouples the view since it no longer knows about routes internals. this is a result of an ongoing discussion at https://github.com/rails/rails/pull/6826. | ||||
* | | | | Merge pull request #6906 from kennyj/extract_collation | Rafael Mendonça França | 2012-06-30 | 8 | -8/+88 |
|\ \ \ \ | | | | | | | | | | | Extract collation tasks to database tasks. | ||||
| * | | | | Extract collation tasks to database tasks. | kennyj | 2012-07-01 | 8 | -8/+88 |
| | | | | | |||||
* | | | | | Merge pull request #6869 from bcardarella/active_relation_inspect | Jon Leighton | 2012-06-30 | 3 | -5/+5 |
|\| | | | | | | | | | | | | | | Remove ActiveRelation#inspect | ||||
| * | | | | Remove ActiveRelation#inspect | Brian Cardarella | 2012-06-29 | 3 | -5/+5 |
|/ / / / | |||||
* | | | | make sure the inflection rules are loaded when cherry-picking ↵ | Xavier Noria | 2012-06-29 | 3 | -0/+5 |
| | | | | | | | | | | | | | | | | active_support/core_ext/string/inflections.rb [fixes #6884] | ||||
* | | | | Fix failing test in file update checker | Carlos Antonio da Silva | 2012-06-29 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 1abe31670fdad2c357b4356b40a4567a46d16693 The test was failing when running on isolation, because the extensions were not being loaded, thus 1.year.from_now was failing. Just use mktime instead, adding 1 year to Time.now. | ||||
* | | | | Remove another missing test related to draw external routes | Carlos Antonio da Silva | 2012-06-29 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | Related with 5e7d6bb | ||||
* | | | | Remove more tests related to draw external routes files | Rafael Mendonça França | 2012-06-29 | 4 | -53/+1 |
| | | | | | | | | | | | | | | | | Related with 5e7d6bba79393de0279917f93b82f3b7b176f4b5 | ||||
* | | | | Merge pull request #6911 from abonec/master | José Valim | 2012-06-29 | 2 | -1/+17 |
|\ \ \ \ | | | | | | | | | | | Bug with FileUpdateChecker with wrong mtime | ||||
| * | | | | fix FileUpdateChecker when file has wrong mtime (from future) | abonec | 2012-06-29 | 2 | -1/+17 |
| | | | | | |||||
* | | | | | Revert "Allow loading external route files from the router" | José Valim | 2012-06-29 | 10 | -149/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb | ||||
* | | | | | Remove unused responsibilities and add a few load definitions to engines | José Valim | 2012-06-29 | 5 | -148/+141 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since plugins were removed, we can clean up a few methods in engines. We also use this opportunity to move `load_console`, `load_tasks` and `load_runner` to Rails::Engine. This means that, if someone wants to improve script/rails for engines to support console or runner commands, part of the work is already done. | ||||
* | | | | Remove unnecessary Railties structure now that plugins are gone | José Valim | 2012-06-29 | 5 | -121/+85 |
| | | | | |||||
* | | | | Depend on thor 0.15.4 | José Valim | 2012-06-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Rename RouteInspect to RoutesInspector for consistency | José Valim | 2012-06-29 | 4 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #6905 from kennyj/add_changelog_entry_20120629 | Santiago Pastorino | 2012-06-29 | 1 | -0/+15 |
|\ \ \ \ | |/ / / |/| | | | Added a changelog entry about fda24312d3. | ||||
| * | | | Added an entry about fda24312d3 in the CHANGELOG. | kennyj | 2012-06-29 | 1 | -0/+15 |
|/ / / | |||||
* | | | Merge pull request #6902 from frodsan/mailer_async_doc | Carlos Antonio da Silva | 2012-06-28 | 2 | -31/+33 |
|\ \ \ | | | | | | | | | fix ActionMailer::Async docs and update to follow coding conventions | ||||
| * | | | fix ActionMailer::Async docs and update to follow coding conventions | Francesco Rodriguez | 2012-06-28 | 2 | -31/+33 |
|/ / / | |||||
* | | | Merge pull request #6900 from cbandy/issue-6898 | Carlos Antonio da Silva | 2012-06-28 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Require URI in ConnectionSpecification | ||||
| * | | | Require URI | Chris Bandy | 2012-06-28 | 1 | -0/+2 |
|/ / / |