aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"José Valim2012-08-074-23/+3
| | | | | | Reverting because it feels backward to specify a delivery to not be performed while the e-mail is being composed. It is simpler (and makes more sense) to delegate the responsibility to the calling code.
* Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ↵David Heinemeier Hansson2012-08-073-76/+4
| | | | | | | what this makes ERB files look like. This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129.
* Revert "The application generator generates `public/humans.txt` with some ↵David Heinemeier Hansson2012-08-073-14/+0
| | | | basic data". I dont consider this something most people is going to want most of the time. If you want to add it in your own app, knock yourself out. But it doesnt belong in Rails imo
* Merge pull request #7033 from kron4eg/masterSantiago Pastorino2012-08-073-4/+76
|\ | | | | Restore "%" ERb/Erubis Trim Mode
| * Restoring the '%' trim mode for ERb templates, allowing for a leading ↵Artiom Di2012-08-073-4/+76
| | | | | | | | percent sign on a line to indicate non-inserted Ruby code.
* | defines String#indent [closes #7263] [Xavier Noria & Ace Suares]Xavier Noria2012-08-075-0/+137
|/
* Merge pull request #7277 from sikachu/master-js-include-tag-fixRafael Mendonça França2012-08-063-6/+20
|\ | | | | Do not include application.js if it doesn't exists
| * Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| |
| * Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-063-4/+18
|/ | | | | | Rails were including 'application.js' to the pack when using `javascript_include_tag :all` even there's no application.js in the public directory.
* Merge pull request #7275 from asanghi/perform_deliveries_in_mailRafael Mendonça França2012-08-061-0/+7
|\ | | | | add changelog for #7202
| * add changelog for #7202Aditya Sanghi2012-08-071-0/+7
|/
* Merge pull request #7272 from lexmag/string_inquirerRafael Mendonça França2012-08-062-9/+23
|\ | | | | Add AS::StringInquirer#respond_to? method
| * Add AS::StringInquirer#respond_to? methodAleksey Magusev2012-08-062-9/+23
| | | | | | | | Consistently with #method_missing
* | let ruby decompose the tuples in the iteratorAaron Patterson2012-08-061-1/+1
| |
* | Don't use `html_escape` to test the escapingRafael Mendonça França2012-08-054-4/+4
| |
* | Add CHANGELOG entry for 3c731a4ad62430100ba0b65bc966aa6dc6280c5fRafael Mendonça França2012-08-051-0/+4
| |
* | Merge pull request #7140 from seamusabshere/patch-1Rafael Mendonça França2012-08-052-2/+7
|\ \ | | | | | | | | | | | | Make sure :environment task is executed before db:schema:load or db:structure:load
| * | Update changelogRafael Mendonça França2012-08-051-0/+5
| | |
| * | Make sure :environment task is executed before db:schema:load or ↵Seamus Abshere2012-07-231-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 Noria2012-08-0632-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_emptyJon Leighton2012-08-051-3/+11
|\ \ \ | |_|/ |/| | Changing AR:CollectionAssociation#empty? to use #exists?
| * | Changing AR:CollectionAssociation#empty? to use #exists?beerlington2012-08-051-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-smallRafael Mendonça França2012-08-051-1/+1
|\ \ | | | | | | Remove warning: `*' interpreted as argument prefix
| * | Remove warning: `*' interpreted as argument prefixArun Agrawal2012-08-051-1/+1
|/ /
* | Revert "polymorphic_url with an array generates a query string"Andrew White2012-08-042-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 White2012-08-043-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_setSantiago Pastorino2012-08-044-25/+14
|\ \ | | | | | | Refator route set
| * | RouteSet: cleanup some unneeded compexityBogdan Gusiev2012-08-041-16/+7
| | |
| * | Renamed _path_segments to _recallBogdan Gusiev2012-08-044-5/+5
| | |
| * | Simplify logical statementBogdan Gusiev2012-08-041-4/+2
| | |
* | | Merge pull request #7202 from asanghi/perform_deliveries_in_mailJosé Valim2012-08-043-3/+16
|\ \ \ | |/ / |/| | Allow perform_deliveries to be set within mailer action
| * | allow perform deliveries to be set within mailer actionAditya Sanghi2012-07-303-3/+16
| | |
* | | Merge branch 'polymorphic_url_builds_query_string_with_array'Andrew White2012-08-043-1/+27
|\ \ \
| * | | Refactor passing url options via array for polymorphic_urlAndrew White2012-08-043-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 stringRomain Tribes2012-08-042-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/docrailsVijay Dev2012-08-0431-424/+1147
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb
| * | | | copy edits [ci skip]Vijay Dev2012-08-044-10/+4
| | | | |
| * | | | Revert "Fix string interpolation in belongs_to docs"Vijay Dev2012-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 3fb0100ef893b8cf229e82ce264b426e0c961eb1.
| * | | | Corrected info about asset pipeline default pathsAndrew Vit2012-08-041-4/+6
| | | | |
| * | | | added info about an error that mysql gives when rails@localhost has a ↵Ace Suares2012-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | password; removed reference to activerecord/test/connections, which isn't there anymore
| * | | | Update guides/source/asset_pipeline.textileMikhail Dieterle2012-08-031-1/+1
| | | | |
| * | | | Fix ActiveModel::Serializers::Xml#to_xml referenceRobert Pankowecki2012-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | Link to ActiveRecord::Serialization#to_xml for more details
| * | | | Audit the usage of the word "JavaScript"Prem Sichanugrist2012-08-025-5/+5
| | | | |
| * | | | fixed wrong route for creating new post [ci skip]Mikhail Dieterle2012-08-021-9/+9
| | | | | | | | | | | | | | | Now there is error ```No route matches [POST] “/posts”```
| * | | | Fix string interpolation in belongs_to docsFranco Catena2012-08-011-1/+1
| | | | |
| * | | | fix punctuation in #resources and #match documentation [ci skip]Francesco Rodriguez2012-07-311-4/+4
| | | | |
| * | | | Update #match documentation [ci skip]Robert Pankowecki2012-07-311-0/+4
| | | | |
| * | | | Update #resources documentation [ci skip]Robert Pankowecki2012-07-311-0/+4
| | | | |
| * | | | update ActiveModel::Observer documentation [ci skip]Francesco Rodriguez2012-07-311-21/+32
| | | | |
| * | | | Fix a mistake in the I18n guide: English => Spanish [ci skip]David Celis2012-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Celis <david@davidcelis.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 01:43:05 +0000