aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add documentation explaining reorder behaviorMatt Jones2012-01-111-0/+10
|
* Made an example a little more realisticcodesnik2012-01-111-1/+1
|
* Merge pull request #4408 from tomstuart/read-and-write-attribute-aliasesSantiago Pastorino2012-01-112-5/+46
| | | | #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute
* Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-notesSantiago Pastorino2012-01-111-11/+8
|\ | | | | Edits to spastorino's upgrade notes
| * Edits to spastorino's additions in 3.2 Release NotesRizwan Reza2012-01-111-11/+8
|/
* FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb:Aaron Patterson2012-01-101-3/+0
|
* deprecate the subdirectories parameter to `migrations`Aaron Patterson2012-01-101-2/+13
| | | | | | Conflicts: activerecord/lib/active_record/migration.rb
* Add "What to update in your apps" section to the release notes guideSantiago Pastorino2012-01-101-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é Valim2012-01-101-1/+0
|
* Remove dead codeSantiago Pastorino2012-01-101-4/+0
|
* Add CHANGELOG entrySantiago Pastorino2012-01-101-0/+2
|
* Rails initialization with initialize_on_precompile = false should set assets_dirSantiago Pastorino2012-01-102-1/+10
|
* Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228)Piotr Sarnacki2012-01-102-7/+51
|
* Add original_fullpath and original_url methods to RequestPiotr Sarnacki2012-01-102-0/+32
|
* Add ORIGINAL_FULLPATH to envPiotr Sarnacki2012-01-103-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-2José Valim2012-01-061-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 ↵kennyj2012-01-071-3/+3
|/ | | | assets:precompile:all. Improve GH #3694.
* Depend on coffee-rails 3.2.1Santiago Pastorino2012-01-051-1/+1
|
* Merge pull request #4311 from kuroda/3-2-negative_formatAaron Patterson2012-01-052-0/+8
|\ | | | | Infer currency negative format from positive one. (3-2-stable)
| * Infer currency negative format from positive one.Tsutomu Kuroda2012-01-052-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 rc2Santiago Pastorino2012-01-049-9/+9
|
* Revert "AS::Callbacks: remove __define_runner"José Valim2012-01-041-3/+16
| | | | | | Runners are used internally. This reverts commit 40c8aa706adbb60ff9d289016fb9020d48969fea.
* Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG.Jeremy Kemper2012-01-042-2/+2
|
* Clarify vendor/plugins deprecation warningJeremy Kemper2012-01-041-1/+1
|
* Merge pull request #4282 from edgecase/order_after_reorderAaron Patterson2012-01-046-9/+25
| | | | correctly handle order calls after a reorder
* Use sass-rails 3.2.3Santiago Pastorino2012-01-041-1/+1
|
* Revert "use pg 0.11.0 under ruby 1.8.7"Santiago Pastorino2012-01-041-5/+1
| | | | | There's a new pg release, no need for this anymore This reverts commit 0b5cda73e2f5d29420afb41d5ed6908baf624934.
* copy editsVijay Dev2012-01-041-10/+7
|
* improve doc in number helper optionsPablo Ifran2012-01-041-19/+57
|
* General editing pass over assets pipeline guideMike Gunderloy2012-01-041-56/+58
|
* updates to 3.2 release notesVijay Dev2012-01-041-1/+8
|
* Final grammar checkup on 3.2 release notes.Kristian Freeman2012-01-041-1/+1
|
* Merge pull request #4288 from kennyj/fix_4285-2José Valim2012-01-032-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_tablekennyj2012-01-042-1/+7
|/
* When generating routes, the last defined named route wins. This is inAaron Patterson2012-01-031-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 Patterson2012-01-032-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-checkingAaron Patterson2012-01-031-1/+1
| | | | use correct variant of checking whether class is a singleton
* Merge pull request #4281 from lest/3-2-changelogSantiago Pastorino2012-01-031-2/+4
|\ | | | | add CHANGELOG entry for AS::Base64 deprecation
| * add CHANGELOG entry for AS::Base64 deprecationSergey Nartimov2012-01-031-2/+4
|/
* Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417Santiago Pastorino2012-01-032-2/+8
|
* Merge pull request #4280 from lest/3-2-backport-callbacksJosé Valim2012-01-031-28/+17
|\ | | | | backport changes in AS::Callbacks
| * AS::Callbacks: remove __define_runnerBogdan Gusiev2012-01-031-16/+3
| |
| * Refactor AS::CallbacksBogdan Gusiev2012-01-031-6/+8
| | | | | | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places
| * AS::Callbacks: improved __define_runner performanceBogdan Gusiev2012-01-031-3/+2
| |
| * AS::Callbacks: improve __define_runner perfomanceBogdan Gusiev2012-01-031-10/+11
| |
* | Override respond_to? since we are also overriding method_missing.José Valim2012-01-032-0/+11
| |
* | Add font_path helper methodSantiago Pastorino2012-01-036-0/+41
|/
* Merge pull request #4279 from lest/fix-logAaron Patterson2012-01-031-1/+1
| | | | do not rewrite log during application bootstrap
* Merge pull request #4278 from kennyj/fix_rdoc_generating_problemSantiago Pastorino2012-01-031-1/+1
| | | | Use -e option instead of -c option (rake rdoc task).
* Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64José Valim2012-01-031-13/+18
|\ | | | | deprecate AS::Base64 methods without DeprecatedConstantProxy