aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"José Valim2012-08-074-23/+3
* Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ...David Heinemeier Hansson2012-08-073-76/+4
* Revert "The application generator generates `public/humans.txt` with some bas...David Heinemeier Hansson2012-08-073-14/+0
* Merge pull request #7033 from kron4eg/masterSantiago Pastorino2012-08-073-4/+76
|\
| * Restoring the '%' trim mode for ERb templates, allowing for a leading percent...Artiom Di2012-08-073-4/+76
* | 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
|\
| * 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
|/
* Merge pull request #7275 from asanghi/perform_deliveries_in_mailRafael Mendonça França2012-08-061-0/+7
|\
| * 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? methodAleksey Magusev2012-08-062-9/+23
* | 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
|\ \
| * | Update changelogRafael Mendonça França2012-08-051-0/+5
| * | Make sure :environment task is executed before db:schema:load or db:structure...Seamus Abshere2012-07-231-2/+2
* | | removes usage of Object#in? from the code base (the method remains defined by...Xavier Noria2012-08-0632-66/+53
* | | Merge pull request #7270 from beerlington/use_exists_for_emptyJon Leighton2012-08-051-3/+11
|\ \ \ | |_|/ |/| |
| * | Changing AR:CollectionAssociation#empty? to use #exists?beerlington2012-08-051-3/+11
|/ /
* | Merge pull request #7268 from arunagw/warning-removed-smallRafael Mendonça França2012-08-051-1/+1
|\ \
| * | 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
* | Revert "Refactor passing url options via array for polymorphic_url"Andrew White2012-08-043-11/+2
* | Merge pull request #7262 from bogdan/refator_route_setSantiago Pastorino2012-08-044-25/+14
|\ \
| * | 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 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
| * | | polymorphic_url with an array generates a query stringRomain Tribes2012-08-042-1/+18
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-0431-424/+1147
|\ \ \ \
| * | | | copy edits [ci skip]Vijay Dev2012-08-044-10/+4
| * | | | Revert "Fix string interpolation in belongs_to docs"Vijay Dev2012-08-041-1/+1
| * | | | 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 passwor...Ace Suares2012-08-031-1/+3
| * | | | Update guides/source/asset_pipeline.textileMikhail Dieterle2012-08-031-1/+1
| * | | | Fix ActiveModel::Serializers::Xml#to_xml referenceRobert Pankowecki2012-08-021-1/+1
| * | | | 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
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 22:23:17 +0000