Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | remove misleading line on 500 error page. | Teng Siong Ong | 2011-08-27 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fixed 500 error message which is misleading by suggesting all rails apps ↵ | Jared Tame | 2011-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | have exception notifications by default | ||||
* | | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, ↵ | Guillermo Iguaran | 2011-09-04 | 1 | -0/+26 |
| |_|/ / |/| | | | | | | | | | | | config.assets.compile = false and manifest file isn't present | ||||
* | | | | Merge docrails, resolving conflicts in the assets guide | Vijay Dev | 2011-09-04 | 9 | -24/+26 |
|\ \ \ \ | |||||
| * | | | | minor fixes in assets guide | Vijay Dev | 2011-09-04 | 1 | -11/+9 |
| | | | | | |||||
| * | | | | Added |t| to create_table block | Rinaldi Fonseca | 2011-09-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add some missing dots in the docs | Vijay Dev | 2011-09-04 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Fix asset_path example in CSS and ERB section | Guillermo Iguaran | 2011-09-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | document send_file guesses content type from the file extension | Vijay Dev | 2011-09-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | and remove info about x_send_file option to send_file | ||||
| * | | | | fix YUI description | Richard Hulse | 2011-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | YUI CSS compressor does not extend syntax! Also added link to more info | ||||
| * | | | | Fixed a typo in the section about migration. | David Peckham | 2011-09-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | some of the changes for validation earlier reverted from d20281a | Vijay Dev | 2011-09-03 | 3 | -4/+6 |
| | | | | | |||||
| * | | | | Change photos_path to photos_url in Using redirect_to | Franco Catena | 2011-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Is more "correct" a complete url than only the path | ||||
* | | | | | Merge pull request #2841 from wojtekmach/app-generators-group | José Valim | 2011-09-04 | 4 | -1/+61 |
|\ \ \ \ \ | | | | | | | | | | | | | Add gem group support to generators | ||||
| * | | | | | Add gem_group support to generators | Wojciech Mach | 2011-09-04 | 4 | -1/+61 |
| | | | | | | |||||
* | | | | | | Merge pull request #2816 from sikachu/content_tag_for | José Valim | 2011-09-04 | 1 | -0/+77 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make `content_tag_for` and `div_for` accepts the array of records | ||||
| * | | | | | | Make `content_tag_for` and `div_for` accepts the array of records | Prem Sichanugrist | 2011-09-04 | 1 | -0/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end | ||||
* | | | | | | | Remove useless parens | Santiago Pastorino | 2011-09-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Modified content in guides and comments | Arun Agrawal | 2011-09-04 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings! | ||||
* | | | | | | | Warnings removed for "assert_match /" Please do | Arun Agrawal | 2011-09-04 | 6 | -25/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | not add more.! | ||||
* | | | | | | | Warnings removed for using shadow variable. | Arun Agrawal | 2011-09-04 | 2 | -4/+4 |
| | | | | | | |