Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add CHANGELOG entry for 3c731a4ad62430100ba0b65bc966aa6dc6280c5f | Rafael Mendonça França | 2012-08-05 | 1 | -0/+4 |
| | |||||
* | Merge pull request #7140 from seamusabshere/patch-1 | Rafael Mendonça França | 2012-08-05 | 2 | -2/+7 |
|\ | | | | | | | | | Make sure :environment task is executed before db:schema:load or db:structure:load | ||||
| * | Update changelog | Rafael Mendonça França | 2012-08-05 | 1 | -0/+5 |
| | | |||||
| * | Make sure :environment task is executed before db:schema:load or ↵ | Seamus Abshere | 2012-07-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db:structure:load Otherwise, if schema_format = :sql, you will see: $ rake db:setup --trace ** Invoke db:setup (first_time) ** Invoke db:schema:load_if_ruby (first_time) ** Invoke db:create (first_time) ** Invoke db:load_config (first_time) ** Invoke rails_env (first_time) ** Execute rails_env ** Execute db:load_config ** Execute db:create db_example_development already exists db_example_test already exists ** Execute db:schema:load_if_ruby #<-------- :environment hasn't been executed yet ** Invoke db:schema:load (first_time) ** Invoke environment (first_time) ** Execute environment ** Execute db:schema:load ~/db_example/db/schema.rb doesn't exist yet. Run `rake db:migrate` to create it then try again. | ||||
* | | removes usage of Object#in? from the code base (the method remains defined ↵ | Xavier Noria | 2012-08-06 | 32 | -66/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by Active Support) Selecting which key extensions to include in active_support/rails made apparent the systematic usage of Object#in? in the code base. After some discussion in https://github.com/rails/rails/commit/5ea6b0df9a36d033f21b52049426257a4637028d we decided to remove it and use plain Ruby, which seems enough for this particular idiom. In this commit the refactor has been made case by case. Sometimes include? is the natural alternative, others a simple || is the way you actually spell the condition in your head, others a case statement seems more appropriate. I have chosen the one I liked the most in each case. | ||||
* | | Merge pull request #7270 from beerlington/use_exists_for_empty | Jon Leighton | 2012-08-05 | 1 | -3/+11 |
|\ \ | | | | | | | Changing AR:CollectionAssociation#empty? to use #exists? | ||||
| * | | Changing AR:CollectionAssociation#empty? to use #exists? | beerlington | 2012-08-05 | 1 | -3/+11 |
|/ / | | | | | | | | | COUNT(*) queries can be slow in PostgreSQL, #exists? avoids this by selecting a single record. | ||||
* | | Merge pull request #7268 from arunagw/warning-removed-small | Rafael Mendonça França | 2012-08-05 | 1 | -1/+1 |
|\ \ | | | | | | | Remove warning: `*' interpreted as argument prefix | ||||
| * | | Remove warning: `*' interpreted as argument prefix | Arun Agrawal | 2012-08-05 | 1 | -1/+1 |
|/ / | |||||
* | | Revert "polymorphic_url with an array generates a query string" | Andrew White | 2012-08-04 | 2 | -18/+1 |
| | | | | | | | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 61c8a4d926343903593a27080216af7e4ed81268. | ||||
* | | Revert "Refactor passing url options via array for polymorphic_url" | Andrew White | 2012-08-04 | 3 | -11/+2 |
| | | | | | | | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 6be564c7a087773cb0b51c54396cc190e4f5c983. | ||||
* | | Merge pull request #7262 from bogdan/refator_route_set | Santiago Pastorino | 2012-08-04 | 4 | -25/+14 |
|\ \ | | | | | | | Refator route set | ||||
| * | | RouteSet: cleanup some unneeded compexity | Bogdan Gusiev | 2012-08-04 | 1 | -16/+7 |
| | | | |||||
| * | | Renamed _path_segments to _recall | Bogdan Gusiev | 2012-08-04 | 4 | -5/+5 |
| | | | |||||
| * | | Simplify logical statement | Bogdan Gusiev | 2012-08-04 | 1 | -4/+2 |
| | | | |||||
* | | | Merge pull request #7202 from asanghi/perform_deliveries_in_mail | José Valim | 2012-08-04 | 3 | -3/+16 |
|\ \ \ | |/ / |/| | | Allow perform_deliveries to be set within mailer action | ||||
| * | | allow perform deliveries to be set within mailer action | Aditya Sanghi | 2012-07-30 | 3 | -3/+16 |
| | | | |||||
* | | | Merge branch 'polymorphic_url_builds_query_string_with_array' | Andrew White | 2012-08-04 | 3 | -1/+27 |
|\ \ \ | |||||
| * | | | Refactor passing url options via array for polymorphic_url | Andrew White | 2012-08-04 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than keep the url options in record_or_hash_or_array, extract it and reverse merge with options as it may contain important private keys like `:routing_type`. Closes #7259 | ||||
| * | | | polymorphic_url with an array generates a query string | Romain Tribes | 2012-08-04 | 2 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | Generating an URL with an array of records is now able to build a query string if the last item of the array is a hash. | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-08-04 | 31 | -424/+1147 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb | ||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2012-08-04 | 4 | -10/+4 |
| | | | | | |||||
| * | | | | Revert "Fix string interpolation in belongs_to docs" | Vijay Dev | 2012-08-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3fb0100ef893b8cf229e82ce264b426e0c961eb1. | ||||
| * | | | | Corrected info about asset pipeline default paths | Andrew Vit | 2012-08-04 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | added info about an error that mysql gives when rails@localhost has a ↵ | Ace Suares | 2012-08-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | password; removed reference to activerecord/test/connections, which isn't there anymore | ||||
| * | | | | Update guides/source/asset_pipeline.textile | Mikhail Dieterle | 2012-08-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix ActiveModel::Serializers::Xml#to_xml reference | Robert Pankowecki | 2012-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Link to ActiveRecord::Serialization#to_xml for more details | ||||
| * | | | | Audit the usage of the word "JavaScript" | Prem Sichanugrist | 2012-08-02 | 5 | -5/+5 |
| | | | | | |||||
| * | | | | fixed wrong route for creating new post [ci skip] | Mikhail Dieterle | 2012-08-02 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | Now there is error ```No route matches [POST] “/posts”``` | ||||
| * | | | | Fix string interpolation in belongs_to docs | Franco Catena | 2012-08-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix punctuation in #resources and #match documentation [ci skip] | Francesco Rodriguez | 2012-07-31 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Update #match documentation [ci skip] | Robert Pankowecki | 2012-07-31 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Update #resources documentation [ci skip] | Robert Pankowecki | 2012-07-31 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | update ActiveModel::Observer documentation [ci skip] | Francesco Rodriguez | 2012-07-31 | 1 | -21/+32 |
| | | | | | |||||
| * | | | | Fix a mistake in the I18n guide: English => Spanish [ci skip] | David Celis | 2012-07-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Celis <david@davidcelis.com> | ||||
| * | | | | Update I18n guide with details on multilingual Inflector [ci skip] | David Celis | 2012-07-31 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry; I forgot about the guides when I submitted this patch. Signed-off-by: David Celis <david@davidcelis.com> | ||||
| * | | | | fix ActiveRecord::Associations::CollectionProxy documentation | Accessd | 2012-07-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | update ActiveModel::ObserverArray documentation [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | add :nodoc: to ActiveModel::Observing#inherited [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | update ActiveModel::Observing documentation [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -25/+125 |
| | | | | | |||||
| * | | | | update ActiveModel::Serializers documentation [ci skip] | Francesco Rodriguez | 2012-07-30 | 2 | -14/+40 |
| | | | | | |||||
| * | | | | add documentation to ActiveModel #from_json method [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -2/+34 |
| | | | | | |||||
| * | | | | Add 'Writing Rake Tasks' subsection to Command Line Guide | Novikov Andrey | 2012-07-31 | 1 | -0/+47 |
| | | | | | |||||
| * | | | | fix #after_validation example [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add mysql authentification command to chapter 2.Running the Test Suite | Vladimir Strakhov | 2012-07-30 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | update AR::Validations::AssociatedValidator documentation [ci skip] | Francesco Rodriguez | 2012-07-29 | 1 | -13/+19 |
| | | | | | |||||
| * | | | | update AR::Validations::UniquenessValidator documentation [ci skip] | Francesco Rodriguez | 2012-07-29 | 1 | -31/+45 |
| | | | | | |||||
| * | | | | add :nodoc: directives to ActiveModel Sanitizers [ci skip] | Francesco Rodriguez | 2012-07-29 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | fix class reference in AM::MassAssignmentSecurity documentation [ci skip] | Francesco Rodriguez | 2012-07-29 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | update ActiveModel::Validations::Callbacks documentation [ci skip] | Francesco Rodriguez | 2012-07-29 | 1 | -18/+69 |
| | | | | |