aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2957 from waseem/migration_status_testsSantiago Pastorino2011-09-091-0/+24
|\
| * Tests for rake db:migrate:status.Waseem Ahmad2011-09-091-1/+25
* | Merge pull request #2876 from alex3/patch-1Santiago Pastorino2011-09-092-1/+30
|\ \
| * | Fixed assets precompile regex, now accepts ProcsAlex Yakoubian2011-09-082-1/+30
* | | 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 #2757 from andmej/first_or_create_pull_requestJon Leighton2011-09-081-7/+68
|\ \
| * | 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-301-7/+68
* | | Remove failing test which was wrongly introduced.Jon Leighton2011-09-081-5/+0
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-084-26/+54
|\ \
| * | 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
| * | copy edit assets guideVijay Dev2011-09-071-19/+19
| * | getting_started.textile: Fix another typodharmatech2011-09-071-1/+1
| * | Rails.root is a Pathname, no need to use File.join first.Joost Baaij2011-09-071-1/+1
| * | Added note about adding a javascript runtime to Gemfile for production enviro...Ryan Walker2011-09-061-0/+8
| * | Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch c...Marcus Ilgner2011-09-061-9/+9
| * | 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
| * | 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-051-1/+1
| * | clarify where the branch name will existRay Baxter2011-09-041-1/+1
* | | Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord SQ...Wayne E. Seguin2011-09-071-2/+3
* | | Refactor assets tests to use add_to_config instead of creating initializers w...Guillermo Iguaran2011-09-061-13/+14
* | | Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-061-0/+48
|\ \ \
| * | | Fix bug #2579.rails-noob2011-09-061-0/+48
* | | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-061-0/+9
|\ \ \ \
| * | | | config.action_controller.perform_caching isn't used anymore in assets pipelin...Guillermo Iguaran2011-09-061-0/+9
* | | | | Bump uglifier upSantiago Pastorino2011-09-051-1/+1
* | | | | Merge pull request #2873 from guilleiguaran/remove-unused-configSantiago Pastorino2011-09-051-3/+0
|\ \ \ \ \
| * | | | | Remove unused config variable from test.rb templateGuillermo Iguaran2011-09-051-3/+0
| |/ / / /
* | | | | Merge pull request #2713 from FLOChip/500-fixedJosé Valim2011-09-051-1/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove misleading line on 500 error page.Teng Siong Ong2011-08-271-1/+0
| * | | | fixed 500 error message which is misleading by suggesting all rails apps have...Jared Tame2011-08-271-1/+1
* | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, c...Guillermo Iguaran2011-09-041-0/+26
| |_|/ / |/| | |
* | | | Merge docrails, resolving conflicts in the assets guideVijay Dev2011-09-049-24/+26
|\ \ \ \
| * | | | minor fixes in assets guideVijay Dev2011-09-041-11/+9
| * | | | Added |t| to create_table blockRinaldi Fonseca2011-09-041-1/+1
| * | | | add some missing dots in the docsVijay Dev2011-09-041-4/+4
| * | | | Fix asset_path example in CSS and ERB sectionGuillermo Iguaran2011-09-021-1/+1
| * | | | document send_file guesses content type from the file extensionVijay Dev2011-09-031-1/+3
| * | | | fix YUI descriptionRichard Hulse2011-09-031-1/+1
| * | | | Fixed a typo in the section about migration.David Peckham2011-09-021-1/+1
| * | | | some of the changes for validation earlier reverted from d20281aVijay Dev2011-09-033-4/+6
| * | | | Change photos_path to photos_url in Using redirect_toFranco Catena2011-09-021-1/+1
* | | | | Merge pull request #2841 from wojtekmach/app-generators-groupJosé Valim2011-09-044-1/+61
|\ \ \ \ \