aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set relative url root in assets when controller isn't available for ↵Guillermo Iguaran2011-09-133-3/+22
| | | | | | Sprockets. Fix #2435 See https://github.com/rails/sass-rails/issues/42 for details
* Merge pull request #2974 from md5/csrf_token_warningSantiago Pastorino2011-09-101-1/+1
|\ | | | | Use ensure instead of rescue
| * Use ensure instead of rescueMike Dillon2011-09-101-1/+1
| |
* | Merge pull request #2972 from md5/masterAaron Patterson2011-09-103-1/+19
|\| | | | | Use log.warn instead of debug for CSRF token warning
| * Fix changelog entryMike Dillon2011-09-101-1/+1
| |
| * Add test for warning and CHANGELOG entryMike Dillon2011-09-102-0/+18
| |
| * Change log level for CSRF token verification warningMike Dillon2011-09-101-1/+1
| |
* | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵Xavier Noria2011-09-101-0/+4
| | | | | | | | #2858]
* | Merge pull request #2970 from deepakprasanna/masterSantiago Pastorino2011-09-101-0/+25
|\ \ | | | | | | Added a case to check the status of the migration after a rollback and redo.
| * | added test for db migrate:redoDeepak Prasanna2011-09-101-0/+25
| |/
* | Merge pull request #2968 from arunagw/form_helper_testVijay Dev2011-09-101-2/+1
|\ \ | |/ |/| No need to use </form> here. It's already in whole_form block
| * No need to use </form> here. It's already in whole_form blockArun Agrawal2011-09-101-2/+1
|/
* Merge pull request #2957 from waseem/migration_status_testsSantiago Pastorino2011-09-091-0/+24
|\ | | | | Tests for rake db:migrate:status.
| * Tests for rake db:migrate:status.Waseem Ahmad2011-09-091-1/+25
| |
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 17:54:10 +0000