aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2876 from alex3/patch-1Santiago Pastorino2011-09-093-1/+32
|\ | | | | Fixed assets precompile regex
| * Fixed assets precompile regex, now accepts ProcsAlex Yakoubian2011-09-083-1/+32
| |
* | Merge pull request #2966 from arunagw/no_use_warnings_removedSantiago Pastorino2011-09-092-3/+3
|\ \ | | | | | | Not used variables removed. Warnings removed.
| * | Not used variables removed. Warnings removed.Arun Agrawal2011-09-102-3/+3
|/ /
* | railties depends on actionpack, so put actionpack in the include pathAaron Patterson2011-09-091-1/+7
| |
* | rake already ships with a ruby commandAaron Patterson2011-09-091-2/+1
| |
* | move route inspecting to an object so that we can more easily test itAaron Patterson2011-09-094-126/+144
| |
* | Merge pull request #2960 from guilleiguaran/fix-isolated-ar-testsAaron Patterson2011-09-091-0/+1
|\ \ | | | | | | Add missing require in base_test.rb, fixes isolated test
| * | Add missing require in base_test.rb, fixes isolated testGuillermo Iguaran2011-09-091-0/+1
|/ /
* | Merge pull request #2956 from lawrencepit/full_messagesJosé Valim2011-09-092-16/+46
|\ \ | | | | | | Ability to get single full error message
| * | Added test for obj.errors.as_jsonLawrence Pit2011-09-091-0/+11
| | |
| * | Add ability to get an individual full error message + test for full_messages.Lawrence Pit2011-09-092-16/+35
|/ /
* | Pull up a method we only use once.Aaron Patterson2011-09-081-5/+1
| |
* | Conditions must never be equalAaron Patterson2011-09-081-6/+1
| |
* | Merge pull request #2757 from andmej/first_or_create_pull_requestJon Leighton2011-09-086-7/+277
|\ \ | | | | | | Add first_or_create family of methods to Active Record
| * | Using more precise method signatures for AR::Relation#first_or_create family ↵Andrés Mejía2011-09-061-6/+6
| | | | | | | | | | | | of methods.
| * | Adding first example with no arguments to AR::Relation#first_or_create and ↵Andrés Mejía2011-09-061-15/+15
| | | | | | | | | | | | removing examples that create several users at the same time (this is confusing and not really helpful).
| * | Adding `first_or_new` documentation to the AR Querying guide.Nicolas Hock Isaza2011-08-301-1/+1
| | |
| * | Adding first_or_create, first_or_create!, first_or_new and first_or_build to ↵Andrés Mejía2011-08-306-7/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record. This let's you write things like: User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson", :hot => true) Related to #2420.
* | | Remove failing test which was wrongly introduced.Jon Leighton2011-09-081-5/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | This test was introduced in pull request #2577. The author of the pull request included the test, which was originally in #2230, at the same time as fixing a separate (but related) bug. However, the author did not include a fix for this test, so when #2577 was merged, a failing test was introduced. So I am removing the failing test for now. If anyone wants to fix the bug, please do so and submit a complete pull request with a test and a fix.
* | revert the changes from c60995f3 - related to marking sub,gsub as ↵Vijay Dev2011-09-091-20/+1
| | | | | | | | unavailable to use with safe strings
* | delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been ↵Xavier Noria2011-09-081-2/+0
| | | | | | | | reverted
* | Revert removing gsub and sub from safe buffer.José Valim2011-09-085-63/+45
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-085-28/+56
|\ \
| * | getting_started.textile section 6: Correct file names in tabledharmatech2011-09-071-3/+3
| | |
| * | Revert "Rails.root is a Pathname, no need to use File.join first."Vijay Dev2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname.
| * | copy edit assets guideVijay Dev2011-09-071-19/+19
| | |
| * | getting_started.textile: Fix another typodharmatech2011-09-071-1/+1
| | |
| * | Fixing `record_key_for_dom_id` documentation. Nicolás Hock Isaza2011-09-071-1/+1
| | | | | | | | | The default implementation joins everything with '_' and not with '-'
| * | Rails.root is a Pathname, no need to use File.join first.Joost Baaij2011-09-071-1/+1
| | |
| * | Revert "Use https for travis-ci build status image to prevent Github from ↵Jeff Dutil2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | caching the failed build image. [ci skip]" This reverts commit a873ea8e9fa5613acf6bfde3cfa2b17daf9a43df. rdoc doesn't generate the image over https.
| * | Use https for travis-ci build status image to prevent Github from caching ↵Jeff Dutil2011-09-061-1/+1
| | | | | | | | | | | | the failed build image. [ci skip]
| * | Added note about adding a javascript runtime to Gemfile for production ↵Ryan Walker2011-09-061-0/+8
| | | | | | | | | | | | environment.
| * | Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch ↵Marcus Ilgner2011-09-061-9/+9
| | | | | | | | | | | | cannot be nested.
| * | Change hyphen to underscore.Uģis Ozols2011-09-061-4/+4
| | |
| * | getting_started.textile: fix minor typodharmatech2011-09-051-1/+1
| | |
| * | Add reference about "bundle install --without assets" in Precompiling Assets ↵Guillermo Iguaran2011-09-041-0/+2
| | | | | | | | | | | | section.
| * | Add CoffeeScript example to JavaScript and ERB sectionGuillermo Iguaran2011-09-041-1/+7
| | |
| * | Add JavaScript and ERB section to Asset GuideGuillermo Iguaran2011-09-041-0/+12
| | |
| * | Fix grammar for content_tag_for and div_for docs.Hendy Tanata2011-09-052-3/+3
| | |
| * | clarify where the branch name will existRay Baxter2011-09-041-1/+1
| | |
* | | mention the issue number for future referenceXavier Noria2011-09-081-1/+1
| | |
* | | registers removal of sub and friends for safe strings in the CHANGELOGXavier Noria2011-09-081-0/+2
| | |
* | | this should have gone with the previous commitXavier Noria2011-09-082-6/+6
| | |
* | | copy-edits a couple of exception messagesXavier Noria2011-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | "Safe Buffer" should either be the constant with the class name, or go in lower case. I've chosen to follow the same terminology that is used in the AS core extensiong guide, "safe string", though "safe buffer" is also used elsewhere, we should pick one.
* | | Merge pull request #2931 from dmathieu/safe_gsub_docVijay Dev2011-09-081-6/+12
|\ \ \ | | | | | | | | better method documentation on disable safe string methods
| * | | better method documentation on disable safe string methodsDamien Mathieu2011-09-081-6/+12
|/ / /
* | | Merge pull request #2248 from dmathieu/safe_gsubJosé Valim2011-09-085-45/+76
|\ \ \ | | | | | | | | make gsub and sub unavailable in SafeBuffers - Closes #1555
| * | | remove support of symbols on classify and camelizeDamien Mathieu2011-09-084-34/+52
| | | |
| * | | make gsub and sub unavailable in SafeBuffers - Closes #1555Damien Mathieu2011-09-082-11/+24
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:48:54 +0000