aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | ARGV.empty? is useless. If ARGV is empty, ARGV.first != "new" will always be ...Madjo DIAPENA2010-07-041-1/+1
* | Fix syntax of routing tests so they actually runAndrew White2010-07-041-12/+18
* | Refactor resource options and scoping. Resource classes are now only responsi...Andrew White2010-07-042-101/+145
* | Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-037-9/+9
* | Merge remote branch 'spastorino/master'Jeremy Kemper2010-07-0311-30/+40
|\ \
| * | Add a missing require to allow the usage of Array#to_xmlSantiago Pastorino2010-07-031-0/+1
| * | Removes the dependency that AMo has on tzinfoSantiago Pastorino2010-07-031-6/+6
| * | Refactor move some date, time and date_time methods to */zones and fixed some...Santiago Pastorino2010-07-039-24/+33
* | | Refactor recall parameter normalization [#5021 state:resolved]Andrew White2010-07-032-18/+33
|/ /
* | Time#formatted_offset is defined in core_ext/time/conversionsSantiago Pastorino2010-07-021-0/+1
* | Time#as_json: use Time#formatted_offset instead of strftime %z directive, whi...Geoff Buesing2010-07-021-1/+1
* | Fix indentJeremy Kemper2010-07-021-1/+1
* | Fix routes with :controller segment when namespaced [#5034 state:resolved]José Valim2010-07-024-30/+63
* | reload_routes! was still referencing old Rails::Application.José Valim2010-07-021-6/+5
* | bump erubis version to 2.6.6 and thor version to 0.13.7Santiago Pastorino2010-07-023-4/+4
* | Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfoSantiago Pastorino2010-07-023-4/+7
* | Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-0215-37/+37
* | porting session.clear fix to master branch. [#5030 state:resolved]Aaron Patterson2010-07-012-0/+27
* | AS json refactor, move to_json implementation to core_ext and a cleanup a bit...Santiago Pastorino2010-07-016-36/+29
* | Bump bundler dependency to 1.0.0.beta.2 or laterJeremy Kemper2010-07-013-2/+3
* | Avoid calls to Rails::Application since this is not the official API.José Valim2010-07-0117-80/+55
* | fix failure if behavior is not define and try use the defaultCyril Mougel2010-07-012-1/+8
* | Add the possibility to have several behaviors in AS::Deprecation.José Valim2010-07-014-3/+19
* | Don't remove scheduled destroys when loading an association. [#4642 state:res...James Le Cuirot2010-07-012-1/+12
* | Make relation a private method.José Valim2010-07-012-6/+7
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-30126-970/+5690
|\
| * Support any mysql-like adapterJeremy Kemper2010-06-301-7/+7
| * add note of which configuration option to set in deprecation warning message ...bodhi2010-06-301-3/+5
| * Improve the idiom used in multibyte chars a bit.José Valim2010-06-301-3/+3
| * Fix ActiveSupport::Multibyte::Chars#slice for empty strings when starting off...Alex Muntean2010-06-302-1/+3
| * Update Unicode database to 5.2.0. [#5011 state:resolved]Norman Clarke2010-06-302-1/+1
| * Fix AS::MB::Chars#+ to not alter self [#4646 state:resolved]James MacAulay2010-06-302-8/+10
| * Add missing CHANGELOG items.José Valim2010-06-301-0/+2
| * A couple enhancements to the router:José Valim2010-06-302-27/+75
| * Clean up the logic to specify the name and path for action a bit.José Valim2010-06-301-87/+51
| * We are trying to test that & escapes here not that & is being escaped, al...Santiago Pastorino2010-06-291-3/+2
| * performance tests now working accurately on 1.9, using Ruby with the GCdata p...Gonçalo Silva2010-06-291-36/+18
| * AssociationCollection#create_by_*, find_or_create_by_* work properly now. [#1...Aaron Patterson2010-06-292-0/+73
| * migrations.rb requires active_support/core_ext/module/aliasing [#5008 state:c...Tekin2010-06-301-0/+1
| * s/escape_once/html_escape/, since html safety is the contract that now says w...Xavier Noria2010-06-306-20/+25
| * url_for no longer escapes HTML, the :escape option is also goneXavier Noria2010-06-305-33/+14
| * Change :notification to :notify (ht: m4n)José Valim2010-06-291-1/+1
| * Add CHANGELOG for new deprecation stylewycats2010-06-291-0/+6
| * _snowman CHANGELOG (dobry pies)wycats2010-06-291-0/+3
| * Create a deprecation behavior that triggers a notification for deprecation no...wycats2010-06-297-10/+52
| * Test that adding an index also doesn't raise an exception.J. Pablo Fernández2010-06-291-1/+1
| * Replaced statement in comment with an assertionPaul Barry2010-06-291-2/+3
| * Fixed error when removing an index from a table name values, which is a reser...J. Pablo Fernández2010-06-292-1/+17
| * No need to check if the attribute exists (this is the same behavior as in 2.3...José Valim2010-06-291-3/+1
| * Push a failing test for issues [#4994] and [#5003].José Valim2010-06-293-1/+23