Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | point rails at Journey for dev and edge | Aaron Patterson | 2011-09-12 | 2 | -0/+3 | |
| | | | ||||||
* | | | adjust route inspection to work with Journey | Aaron Patterson | 2011-09-12 | 1 | -1/+2 | |
| | | | ||||||
* | | | Use the proper executable on tests. | José Valim | 2011-09-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2985 from kennyj/master | Santiago Pastorino | 2011-09-12 | 1 | -0/+16 | |
|\| | | | | | | | | fix https://github.com/rails/rails/issues/2582 (with testcase) | |||||
| * | | fix https://github.com/rails/rails/issues/2582 (with testcase) | kennyj | 2011-09-13 | 1 | -1/+17 | |
| | | | ||||||
* | | | Just provide the executable for railtie. This should be fine since Rubygems ↵ | José Valim | 2011-09-12 | 1 | -1/+6 | |
| | | | | | | | | | | | | now warns before overriding them. | |||||
* | | | Added getting_started code, updated guide with link to rails github repo and ↵ | James Gifford | 2011-09-12 | 89 | -0/+1417 | |
| |/ |/| | | | | | path to code | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-11 | 3 | -9/+9 | |
|\ \ | ||||||
| * | | Fix typo in "must-revalidate" header name | Emin Hasanov | 2011-09-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix for :instance_reader => false code example | Andy Lindeman | 2011-09-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update to conform to rails 3.1 generated caode | Michael P Laing | 2011-09-10 | 1 | -2/+2 | |
| | | | ||||||
| * | | some copy-edits | Vijay Dev | 2011-09-08 | 2 | -5/+5 | |
| | | | ||||||
* | | | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵ | Xavier Noria | 2011-09-10 | 1 | -0/+4 | |
| | | | | | | | | | | | | #2858] | |||||
* | | | added test for db migrate:redo | Deepak Prasanna | 2011-09-10 | 1 | -0/+25 | |
| | | | ||||||
* | | | Merge pull request #2957 from waseem/migration_status_tests | Santiago Pastorino | 2011-09-09 | 1 | -0/+24 | |
|\ \ \ | | | | | | | | | Tests for rake db:migrate:status. | |||||
| * | | | Tests for rake db:migrate:status. | Waseem Ahmad | 2011-09-09 | 1 | -1/+25 | |
| | | | | ||||||
* | | | | Merge pull request #2876 from alex3/patch-1 | Santiago Pastorino | 2011-09-09 | 2 | -1/+30 | |
|\ \ \ \ | | | | | | | | | | | Fixed assets precompile regex | |||||
| * | | | | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 2 | -1/+30 | |
| | |/ / | |/| | | ||||||
* | | | | railties depends on actionpack, so put actionpack in the include path | Aaron Patterson | 2011-09-09 | 1 | -1/+7 | |
| | | | | ||||||
* | | | | rake already ships with a ruby command | Aaron Patterson | 2011-09-09 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | move route inspecting to an object so that we can more easily test it | Aaron Patterson | 2011-09-09 | 4 | -126/+144 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #2757 from andmej/first_or_create_pull_request | Jon Leighton | 2011-09-08 | 1 | -7/+68 | |
|\ \ \ | | | | | | | | | Add first_or_create family of methods to Active Record | |||||
| * | | | Adding `first_or_new` documentation to the AR Querying guide. | Nicolas Hock Isaza | 2011-08-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Adding first_or_create, first_or_create!, first_or_new and first_or_build to ↵ | Andrés Mejía | 2011-08-30 | 1 | -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 Leighton | 2011-09-08 | 1 | -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/docrails | Vijay Dev | 2011-09-08 | 4 | -26/+54 | |
|\ \ \ | ||||||
| * | | | getting_started.textile section 6: Correct file names in table | dharmatech | 2011-09-07 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Revert "Rails.root is a Pathname, no need to use File.join first." | Vijay Dev | 2011-09-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname. | |||||
| * | | | copy edit assets guide | Vijay Dev | 2011-09-07 | 1 | -19/+19 | |
| | | | | ||||||
| * | | | getting_started.textile: Fix another typo | dharmatech | 2011-09-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Rails.root is a Pathname, no need to use File.join first. | Joost Baaij | 2011-09-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Added note about adding a javascript runtime to Gemfile for production ↵ | Ryan Walker | 2011-09-06 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | environment. | |||||
| * | | | Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch ↵ | Marcus Ilgner | 2011-09-06 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | cannot be nested. | |||||
| * | | | Change hyphen to underscore. | Uģis Ozols | 2011-09-06 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | getting_started.textile: fix minor typo | dharmatech | 2011-09-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add reference about "bundle install --without assets" in Precompiling Assets ↵ | Guillermo Iguaran | 2011-09-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | section. | |||||
| * | | | Add CoffeeScript example to JavaScript and ERB section | Guillermo Iguaran | 2011-09-04 | 1 | -1/+7 | |
| | | | | ||||||
| * | | | Add JavaScript and ERB section to Asset Guide | Guillermo Iguaran | 2011-09-04 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | Fix grammar for content_tag_for and div_for docs. | Hendy Tanata | 2011-09-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | clarify where the branch name will exist | Ray Baxter | 2011-09-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord ↵ | Wayne E. Seguin | 2011-09-07 | 1 | -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 Iguaran | 2011-09-06 | 1 | -13/+14 | |
| |_|/ |/| | | | | | | | | with config values | |||||
* | | | Merge pull request #2577 from rails-noob/master | Santiago Pastorino | 2011-09-06 | 1 | -0/+48 | |
|\ \ \ | | | | | | | | | Fix double slash at start of paths when mounting an engine at the root. | |||||
| * | | | Fix bug #2579. | rails-noob | 2011-09-06 | 1 | -0/+48 | |
| | | | | | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root. | |||||
* | | | | Merge pull request #2889 from guilleiguaran/perform-caching-assets | Santiago Pastorino | 2011-09-06 | 1 | -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 Iguaran | 2011-09-06 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | pipeline, instead we are using config.assets.digest now | |||||
* | | | | | Bump uglifier up | Santiago Pastorino | 2011-09-05 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #2873 from guilleiguaran/remove-unused-config | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unused config variable from test.rb template | |||||
| * | | | | | Remove unused config variable from test.rb template | Guillermo Iguaran | 2011-09-05 | 1 | -3/+0 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2713 from FLOChip/500-fixed | José Valim | 2011-09-05 | 1 | -1/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | remove misleading line on 500 error page. #2648 |