aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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 ↵Jared Tame2011-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | have exception notifications by default
* | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, ↵Guillermo Iguaran2011-09-041-0/+26
| |_|/ / |/| | | | | | | | | | | config.assets.compile = false and manifest file isn't present
* | | | 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
| | | | | | | | | | | | | | | | | | | | and remove info about x_send_file option to send_file
| * | | | fix YUI descriptionRichard Hulse2011-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | YUI CSS compressor does not extend syntax! Also added link to more info
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Is more "correct" a complete url than only the path
* | | | | Merge pull request #2841 from wojtekmach/app-generators-groupJosé Valim2011-09-044-1/+61
|\ \ \ \ \ | | | | | | | | | | | | Add gem group support to generators
| * | | | | Add gem_group support to generatorsWojciech Mach2011-09-044-1/+61
| | | | | |
* | | | | | Merge pull request #2816 from sikachu/content_tag_forJosé Valim2011-09-041-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 recordsPrem Sichanugrist2011-09-041-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 parensSantiago Pastorino2011-09-041-1/+1
| | | | | | |
* | | | | | | Modified content in guides and commentsArun Agrawal2011-09-043-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings!
* | | | | | | Warnings removed for "assert_match /" Please doArun Agrawal2011-09-046-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not add more.!
* | | | | | | Warnings removed for using shadow variable.Arun Agrawal2011-09-042-4/+4
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 23:22:34 +0000