Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4412 from kennyj/fix_3743 | Santiago Pastorino | 2012-01-11 | 1 | -0/+2 |
| | | | | Fix GH #3743. We must specify an encoding in rdoc_option explicitly. | ||||
* | Some revisions to the release notes guide | Vijay Dev | 2012-01-11 | 1 | -13/+13 |
| | | | | | | Conflicts: railties/guides/source/3_2_release_notes.textile | ||||
* | add documentation explaining reorder behavior | Matt Jones | 2012-01-11 | 1 | -0/+10 |
| | |||||
* | Made an example a little more realistic | codesnik | 2012-01-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases | Santiago Pastorino | 2012-01-11 | 2 | -5/+46 |
| | | | | #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute | ||||
* | Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-notes | Santiago Pastorino | 2012-01-11 | 1 | -11/+8 |
|\ | | | | | Edits to spastorino's upgrade notes | ||||
| * | Edits to spastorino's additions in 3.2 Release Notes | Rizwan Reza | 2012-01-11 | 1 | -11/+8 |
|/ | |||||
* | FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb: | Aaron Patterson | 2012-01-10 | 1 | -3/+0 |
| | |||||
* | deprecate the subdirectories parameter to `migrations` | Aaron Patterson | 2012-01-10 | 1 | -2/+13 |
| | | | | | | Conflicts: activerecord/lib/active_record/migration.rb | ||||
* | Add "What to update in your apps" section to the release notes guide | Santiago Pastorino | 2012-01-10 | 1 | -0/+29 |
| | | | | | We should keep this up to date and the current version is probably wrong and/or incomplete. HELP!!! | ||||
* | Remove duplicated test line which was causing Ci failures on 1.8.7. | José Valim | 2012-01-10 | 1 | -1/+0 |
| | |||||
* | Remove dead code | Santiago Pastorino | 2012-01-10 | 1 | -4/+0 |
| | |||||
* | Add CHANGELOG entry | Santiago Pastorino | 2012-01-10 | 1 | -0/+2 |
| | |||||
* | Rails initialization with initialize_on_precompile = false should set assets_dir | Santiago Pastorino | 2012-01-10 | 2 | -1/+10 |
| | |||||
* | Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228) | Piotr Sarnacki | 2012-01-10 | 2 | -7/+51 |
| | |||||
* | Add original_fullpath and original_url methods to Request | Piotr Sarnacki | 2012-01-10 | 2 | -0/+32 |
| | |||||
* | Add ORIGINAL_FULLPATH to env | Piotr Sarnacki | 2012-01-10 | 3 | -1/+54 |
| | | | | | | | | | | | This behaves similarly to REQUEST_URI, but we need to implement it on our own because REQUEST_URI is not reliable. Note that since PATH_INFO does not contain information about trailing question mark, this is not 100% accurate, for example `/foo?` will result in `/foo` in ORIGINAL_FULLPATH | ||||
* | Merge pull request #4352 from kennyj/improve_3694-2 | José Valim | 2012-01-06 | 1 | -3/+3 |
|\ | | | | | [3-2-stable] Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all. | ||||
| * | Don't fork a process when assets:precompile:nondigest is invoked in ↵ | kennyj | 2012-01-07 | 1 | -3/+3 |
|/ | | | | assets:precompile:all. Improve GH #3694. | ||||
* | Depend on coffee-rails 3.2.1 | Santiago Pastorino | 2012-01-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4311 from kuroda/3-2-negative_format | Aaron Patterson | 2012-01-05 | 2 | -0/+8 |
|\ | | | | | Infer currency negative format from positive one. (3-2-stable) | ||||
| * | Infer currency negative format from positive one. | Tsutomu Kuroda | 2012-01-05 | 2 | -0/+8 |
|/ | | | | | | | | When a locale file sets the format of the positive currency value as '%n %u', the default negative currency format should be '-%n %u'. Cherry-picked from master (6724c8c8) | ||||
* | Bump to rc2 | Santiago Pastorino | 2012-01-04 | 9 | -9/+9 |
| | |||||
* | Revert "AS::Callbacks: remove __define_runner" | José Valim | 2012-01-04 | 1 | -3/+16 |
| | | | | | | Runners are used internally. This reverts commit 40c8aa706adbb60ff9d289016fb9020d48969fea. | ||||
* | Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG. | Jeremy Kemper | 2012-01-04 | 2 | -2/+2 |
| | |||||
* | Clarify vendor/plugins deprecation warning | Jeremy Kemper | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 6 | -9/+25 |
| | | | | correctly handle order calls after a reorder | ||||
* | Use sass-rails 3.2.3 | Santiago Pastorino | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | Revert "use pg 0.11.0 under ruby 1.8.7" | Santiago Pastorino | 2012-01-04 | 1 | -5/+1 |
| | | | | | There's a new pg release, no need for this anymore This reverts commit 0b5cda73e2f5d29420afb41d5ed6908baf624934. | ||||
* | copy edits | Vijay Dev | 2012-01-04 | 1 | -10/+7 |
| | |||||
* | improve doc in number helper options | Pablo Ifran | 2012-01-04 | 1 | -19/+57 |
| | |||||
* | General editing pass over assets pipeline guide | Mike Gunderloy | 2012-01-04 | 1 | -56/+58 |
| | |||||
* | updates to 3.2 release notes | Vijay Dev | 2012-01-04 | 1 | -1/+8 |
| | |||||
* | Final grammar checkup on 3.2 release notes. | Kristian Freeman | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4288 from kennyj/fix_4285-2 | José Valim | 2012-01-03 | 2 | -1/+7 |
|\ | | | | | (3-2-stable) Fix GH #4285. Remove options when we record calling create_table | ||||
| * | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 2 | -1/+7 |
|/ | |||||
* | When generating routes, the last defined named route wins. This is in | Aaron Patterson | 2012-01-03 | 1 | -15/+23 |
| | | | | | | | | | | contrast to route recognition where the first recognized route wins. This behavior will not exist in Rails 4.0. See: https://github.com/rails/rails/issues/4245 https://github.com/rails/rails/issues/4164 | ||||
* | Revert "Named Routes shouldn't override existing ones (currently route ↵ | Aaron Patterson | 2012-01-03 | 2 | -3/+3 |
| | | | | | | recognition goes with the earliest match, named routes use the latest match)" This reverts commit 71d769e3b58cb56b4b1d5143936c65be8b27c490. | ||||
* | Merge pull request #4283 from lest/fix-singleton-checking | Aaron Patterson | 2012-01-03 | 1 | -1/+1 |
| | | | | use correct variant of checking whether class is a singleton | ||||
* | Merge pull request #4281 from lest/3-2-changelog | Santiago Pastorino | 2012-01-03 | 1 | -2/+4 |
|\ | | | | | add CHANGELOG entry for AS::Base64 deprecation | ||||
| * | add CHANGELOG entry for AS::Base64 deprecation | Sergey Nartimov | 2012-01-03 | 1 | -2/+4 |
|/ | |||||
* | Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417 | Santiago Pastorino | 2012-01-03 | 2 | -2/+8 |
| | |||||
* | Merge pull request #4280 from lest/3-2-backport-callbacks | José Valim | 2012-01-03 | 1 | -28/+17 |
|\ | | | | | backport changes in AS::Callbacks | ||||
| * | AS::Callbacks: remove __define_runner | Bogdan Gusiev | 2012-01-03 | 1 | -16/+3 |
| | | |||||
| * | Refactor AS::Callbacks | Bogdan Gusiev | 2012-01-03 | 1 | -6/+8 |
| | | | | | | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places | ||||
| * | AS::Callbacks: improved __define_runner performance | Bogdan Gusiev | 2012-01-03 | 1 | -3/+2 |
| | | |||||
| * | AS::Callbacks: improve __define_runner perfomance | Bogdan Gusiev | 2012-01-03 | 1 | -10/+11 |
| | | |||||
* | | Override respond_to? since we are also overriding method_missing. | José Valim | 2012-01-03 | 2 | -0/+11 |
| | | |||||
* | | Add font_path helper method | Santiago Pastorino | 2012-01-03 | 6 | -0/+41 |
|/ | |||||
* | Merge pull request #4279 from lest/fix-log | Aaron Patterson | 2012-01-03 | 1 | -1/+1 |
| | | | | do not rewrite log during application bootstrap |