aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* point rails at Journey for dev and edgeAaron Patterson2011-09-122-0/+3
|
* adjust route inspection to work with JourneyAaron Patterson2011-09-121-1/+2
|
* Use the proper executable on tests.José Valim2011-09-121-1/+1
|
* Merge pull request #2985 from kennyj/masterSantiago Pastorino2011-09-121-0/+16
|\ | | | | fix https://github.com/rails/rails/issues/2582 (with testcase)
| * fix https://github.com/rails/rails/issues/2582 (with testcase)kennyj2011-09-131-1/+17
| |
* | Just provide the executable for railtie. This should be fine since Rubygems ↵José Valim2011-09-121-1/+6
| | | | | | | | now warns before overriding them.
* | Added getting_started code, updated guide with link to rails github repo and ↵James Gifford2011-09-1289-0/+1417
| | | | | | | | path to code
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-113-9/+9
|\ \
| * | Fix typo in "must-revalidate" header nameEmin Hasanov2011-09-111-1/+1
| | |
| * | Fix for :instance_reader => false code exampleAndy Lindeman2011-09-101-1/+1
| | |
| * | Update to conform to rails 3.1 generated caodeMichael P Laing2011-09-101-2/+2
| | |
| * | some copy-editsVijay Dev2011-09-082-5/+5
| | |
* | | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵Xavier Noria2011-09-101-0/+4
| | | | | | | | | | | | #2858]
* | | added test for db migrate:redoDeepak Prasanna2011-09-101-0/+25
| | |
* | | 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-092-1/+30
|\ \ \ \ | | | | | | | | | | Fixed assets precompile regex
| * | | | 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
|\ \ \ | | | | | | | | Add first_or_create family of methods to Active Record
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | 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 ↵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-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 ↵Wayne E. Seguin2011-09-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLServer Adapter ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter ), AR SQLServer Adapter works for Linux, OSX and Windows. Thus the sqlserver adapter should include so that users may use it with the new application generator: rails new w00t -d sqlserver ...
* | | | Refactor assets tests to use add_to_config instead of creating initializers ↵Guillermo Iguaran2011-09-061-13/+14
| |_|/ |/| | | | | | | | with config values
* | | Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-061-0/+48
|\ \ \ | | | | | | | | Fix double slash at start of paths when mounting an engine at the root.
| * | | Fix bug #2579.rails-noob2011-09-061-0/+48
| | | | | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root.
* | | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-061-0/+9
|\ \ \ \ | | | | | | | | | | config.action_controller.perform_caching isn't used anymore in asset pipeline
| * | | | config.action_controller.perform_caching isn't used anymore in assets ↵Guillermo Iguaran2011-09-061-0/+9
| | | | | | | | | | | | | | | | | | | | pipeline, instead we are using config.assets.digest now
* | | | | 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 template
| * | | | | 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. #2648