aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* warning fixed: ambiguous first argument; put parentheses or even spacesArun Agrawal2012-10-101-7/+7
|
* Merge pull request #7859 from ernie/fix-collection-associations-with-selectAaron Patterson2012-10-092-1/+9
|\ | | | | Fix has_many assocation w/select load after create
| * Fix has_many assocation w/select load after createErnie Miller2012-10-052-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you create a new record via a collection association proxy that has not loaded its target, and which selects additional attributes through the association, then when the proxy loads its target, it will inadvertently trigger an ActiveModel::MissingAttributeError during attribute writing when CollectionAssociation#merge_target_lists attempts to do its thing, since the newly loaded records will possess attributes the created record does not. This error also raises a bogus/confusing deprecation warning when accessing the association in Rails 3.2.x, so cherry-pick would be appreciated!
* | Merge pull request #7878 from blowmage/test_locationsJeremy Kemper2012-10-0934-146/+187
|\ \ | | | | | | Update test names and locations
| * | Update test locationsMike Moore2012-10-0934-146/+187
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional)
* | let (array|hash)/conversions.rb load the extensions in ↵Xavier Noria2012-10-093-3/+5
| | | | | | | | object/to_(param|query).rb
* | adds a missing requireXavier Noria2012-10-091-0/+1
| |
* | Merge pull request #7885 from guilleiguaran/railties-changelogRafael Mendonça França2012-10-091-2/+7
|\ \ | | | | | | Add missing entry in CHANGELOG about config.assets.cache change
| * | Add missing entry in CHANGELOG about config.assets.cache changeGuillermo Iguaran2012-10-091-2/+7
| | |
* | | Merge pull request #7883 from guilleiguaran/refactor-assets-testRafael Mendonça França2012-10-092-16/+1
|\ \ \ | | | | | | | | Minor refactors in assets test
| * | | Remove duplicated testGuillermo Iguaran2012-10-091-15/+0
| | | |
| * | | Minor test refactoring: Use add_to_env instead of an initializerGuillermo Iguaran2012-10-091-1/+1
| |/ /
* | | adds missing requireXavier Noria2012-10-091-0/+1
| | |
* | | Merge pull request #7881 from guilleiguaran/fix-initializerRafael Mendonça França2012-10-091-3/+3
|\ \ \ | | | | | | | | Rails.config doesn't exist, it should be Rails.application.config instead
| * | | Rails.config doesn't exist, it should be Rails.application.config insteadGuillermo Iguaran2012-10-091-3/+3
| |/ /
* | | copy-edits ae9b3d7 [ci skip]Xavier Noria2012-10-091-2/+3
| | |
* | | AS guide: revises the description of #monday, and #sunday [ci skip]Xavier Noria2012-10-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The start of the week is a parameter nowadays, it is a little confusing that we say here that we assume something about it. Better to use "next" and "previous", which are clear regardless of the concept of beginning of week. Adds examples for the edge cases where the receiver is a Monday or Sunday itself.
* | | Merge pull request #7736 from gregolsen/beginning_of_week_guidesXavier Noria2012-10-091-2/+6
|\ \ \ | | | | | | | | ActiveSupport core extensions guides update
| * | | active support core extensions guides updated with config.beginning_of_week infogregolsen2012-09-221-2/+6
| | | |
* | | | keys.include? -> key?Xavier Noria2012-10-091-1/+1
| | | |
* | | | Merge pull request #7817 from NARKOZ/object-conversionsXavier Noria2012-10-094-11/+2
|\ \ \ \ | |_|/ / |/| | | remove unnecessary object/conversions file
| * | | remove unnecessary object/conversions fileNihad Abbasov2012-10-024-11/+2
| | | |
* | | | Merge pull request #7877 from claudiob/remove_duplicate_article_THERafael Mendonça França2012-10-082-2/+2
|\ \ \ \ | | | | | | | | | | Remove duplicate 'the' article in commented line
| * | | | Remove duplicate 'the' article in commented lineclaudiob2012-10-082-2/+2
|/ / / / | | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file"
* | | | Merge pull request #7875 from senny/interpolation_for_executeRafael Mendonça França2012-10-081-17/+0
|\ \ \ \ | | | | | | | | | | remove unused `expand_range_bind_variables` method
| * | | | remove unused `expand_range_bind_variables` methodYves Senn2012-10-081-17/+0
|/ / / / | | | | | | | | | | | | this method was not used, not documented and not tested.
* | | | Merge pull request #7873 from steveklabnik/update_initializerDavid Heinemeier Hansson2012-10-082-8/+7
|\ \ \ \ | | | | | | | | | | Moving locale stuff from app.rb to an initializer.
| * | | | Moving locale stuff from app.rb to an initializer.Steve Klabnik2012-10-082-8/+7
| | | | |
* | | | | Cleanup comments a bit and fuck 80 charactersDavid Heinemeier Hansson2012-10-081-16/+10
| | | | |
* | | | | Inline commentDavid Heinemeier Hansson2012-10-081-3/+1
|/ / / /
* | | | Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23David Heinemeier Hansson2012-10-081-3/+0
| | | |
* | | | Everyone is running bundler, no need for defensive programming shitDavid Heinemeier Hansson2012-10-081-2/+2
| | | |
* | | | Not precompiling your assets for production is a bad idea -- do not encourage itDavid Heinemeier Hansson2012-10-081-6/+2
| | | |
* | | | Merge pull request #7872 from kennyj/should_use_app_pathsJosé Valim2012-10-081-1/+2
|\ \ \ \ | | | | | | | | | | Should use app.paths instead of specific path.
| * | | | Should use app.paths instead of specific path.kennyj2012-10-081-1/+2
|/ / / /
* | | | Merge pull request #6282 from alexeymuranov/rename-fixtures-classRafael Mendonça França2012-10-0714-63/+83
|\ \ \ \ | | | | | | | | | | Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"
| * | | | Add CHANGELOG entry for "Fixtures" -> "FixtureSet"Alexey Muranov2012-10-071-1/+13
| | | | |
| * | | | Move/rename files to follow naming conventionsAlexey Muranov2012-10-073-1/+1
| | | | |
| * | | | Deprecate "Fixtures" constantAlexey Muranov2012-10-071-0/+8
| | | | |
| * | | | Rename "Fixtures" class to "FixtureSet"Alexey Muranov2012-10-0713-61/+61
| | | | | | | | | | | | | | | | | | | | Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
* | | | | Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntaxRafael Mendonça França2012-10-0715-169/+169
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update actionmailer with new hash syntax. Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests. I'm accepting this because Action Mailer has only two open pull requests.
| * | | | Update actionmailer with new hash syntax.Kirill Nikitin2012-10-0715-169/+169
|/ / / /
* | | | explains why these requires are in an unusual placeXavier Noria2012-10-071-0/+8
| | | |
* | | | Merge pull request #7650 from kennyj/fix_warning_20120915Xavier Noria2012-10-071-6/+7
|\ \ \ \ | | | | | | | | | | Fix warning: circular require considered harmful.
| * | | | Fix warning: circular require considered harmful.kennyj2012-10-031-6/+7
| | | | |
* | | | | adds a CHANGELOG for guides and registers the new responsive designXavier Noria2012-10-071-0/+3
| | | | |
* | | | | Gotta log each spacer line separately to ensure each is taggedJeremy Kemper2012-10-061-1/+4
| | | | |
* | | | | Tag the blank log line between dev requests so it's easier to filter out ↵Jeremy Kemper2012-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* | | | | Remove unneeded attr_readerRafael Mendonça França2012-10-071-1/+0
| | | | |
* | | | | Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a ↵Jeremy Kemper2012-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | few times, so fix up the test to work with however it chooses to escape.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 15:39:46 +0000