aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #11784 from davetoxa/patch-2Carlos Antonio da Silva2013-08-061-1/+1
|\ \ \ | | | | | | | | Bump ruby version [ci skip]
| * | | Bump ruby version [ci skip]Anton Cherepanov2013-08-071-1/+1
| | | |
* | | | Merge pull request #11783 from davetoxa/patch-1Carlos Antonio da Silva2013-08-061-3/+3
|\ \ \ \ | |/ / / |/| | | Bump ruby version [ci skip]
| * | | Bump ruby version [ci skip]Anton Cherepanov2013-08-071-3/+3
|/ / /
* | | test to express that we can't turn non-array columns to array columns.Yves Senn2013-08-061-0/+9
| | | | | | | | | | | | Closes #11062
* | | Merge pull request #11780 from thedarkone/logger-naked-rescue-fixGuillermo Iguaran2013-08-062-3/+7
|\ \ \ | | | | | | | | Rack::Logger naked rescue fix
| * | | "Naked" rescue clauses only catch StandardError subclasses.thedarkone2013-08-062-3/+6
| | | | | | | | | | | | | | | | Similar to #11497.
| * | | Add a missing require.thedarkone2013-08-061-0/+1
|/ / / | | | | | | | | | This makes the rack_logger_test.rb runnable by itself (outside of the `rake test` suite).
* | | Use the proper encoding comment on the fileRafael Mendonça França2013-08-061-0/+2
| | |
* | | Fix indentationRafael Mendonça França2013-08-061-3/+2
| | |
* | | asakusa.rb hack night!Aaron Patterson + Akira Matsuda2013-08-062-0/+5
| | | | | | | | | | | | Fix in-memory tests
* | | Add CHANGELOG entry for #11767Rafael Mendonça França2013-08-061-0/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #11778 from jetthoughts/11759_update_assets_guidesRafael Mendonça França2013-08-061-2/+2
|\ \ \ | | | | | | | | Update Assets Pipeline Guide [ci skip]
| * | | #11759: Update Assets Pipeline GuidePaul Nikitochkin2013-08-061-2/+2
| | | | | | | | | | | | | | | | by default included to precompile only non-js/css files from `app/assets` and `application.(css|js)`
* | | | adding a weird test caseAaron Patterson2013-08-062-0/+8
|/ / /
* | | Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_wordsRafael Mendonça França2013-08-051-5/+7
|\ \ \ | | | | | | | | Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
| * | | Remove privatizing of Fixnum#/ from assert_distance_of_time_in_wordsAlex Tambellini2013-08-051-5/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | MRI reimplemented Date in C so it doesn't hit this division anymore while JRuby still uses the old stdlib implementation of Date so it will always hit this. With this change the actionview date_helper_test.rb tests should pass on JRuby.
* | | Merge pull request #11743 from gaurish/tmp-magicGuillermo Iguaran2013-08-051-0/+0
|\ \ \ | | | | | | | | [Jruby] Make all tests in ActionView::TemplateDigestorTest green
| * | | Add tmp dir in actionview/test/Gaurish Sharma2013-08-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing tmp directory will cause the test to fail on JRuby. will commit adds tmp directory & 22 TemplateDigestorTests which were failing before are now green. Further Discussion on this can be seen at #11743
* | | | config[:database] should be a stringRafael Mendonça França2013-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | This change was breaking the Railties tests. See https://travis-ci.org/rails/rails/jobs/9865969
* | | | Remove deprecated branch on the scope method.Rafael Mendonça França2013-08-051-6/+2
| | | | | | | | | | | | | | | | The deprecation message was removed on 50cbc03d18c5984347965a94027879623fc44cce but the code was not.
* | | | Use the right instrumentation nameRafael Mendonça França2013-08-053-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern is event.component Closes #11769 Conflicts: railties/CHANGELOG.md
* | | | Merge pull request #11767 from kassio/master-load-fixtures-from-linked-folderRafael Mendonça França2013-08-055-4/+17
|\ \ \ \ | | | | | | | | | | Load fixtures from linked folders[master]
| * | | | load fixtures from linked foldersKassio Borges2013-08-055-4/+17
| | | | |
* | | | | Merge pull request #11666 from prathamesh-sonpatki/doc-fixXavier Noria2013-08-051-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Removed confusing statement about adding route for show action in getting started guide [ci skip]
| * | | | | Removed confusing statements about routes in getting started guide [ci skip]Prathamesh Sonpatki2013-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - routes for CRUD already exists as `resources :posts` is in `config/routes.rb` - So we don't have to add any new route in the `config/routes.rb` - As per #11644, the adding of routes which are already there confuses user, so here its changed to referring output of `rake routes`
* | | | | | Merge pull request #11762 from peterkovacs/patch-2Carlos Antonio da Silva2013-08-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Free result_metadata directly instead of freeing 2nd, redundant call.
| * | | | | | Free result_metadata directly instead of freeing 2nd, redundant call.Peter Kovacs2013-08-051-1/+1
| |/ / / / / | | | | | | | | | | | | `result_metadata` returns a new object each time it is called, so calling `result_metadata.free` is essentially a noop. Instead call `free` directly on the metadata when we're done with it.
* | | | | | Merge pull request #11763 from schneems/schneems/create-sqlite3dbJosé Valim2013-08-053-3/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Create sqlite3 directory if not present
| * | | | | Create sqlite3 directory if not presentschneems2013-08-053-3/+30
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the `db/` directory is not present on a remote machine it will blow up in unexpected ways with error messages that do not indicate there is a missing directory: ``` SQLite3::CantOpenException: unable to open database file ``` This PR checks to see if a directory exists for the sqlite3 file and if not creates it for you. This PR is an alternative to #11692 as suggested by @josevalim
* | | | | migrations guide: fix and edits [ci skip]Xavier Noria2013-08-051-7/+9
| | | | |
* | | | | getting started guide: pass the resource to the URL helper [ci skip]Xavier Noria2013-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Passing the actual ID is not idiomatic.
* | | | | Merge pull request #11760 from rahul100885/masterRafael Mendonça França2013-08-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added data for permit array into scalar value [ci skip]
| * | | | | Added data for permit array into scalar valueRahul P. Chaudhari2013-08-051-0/+1
| | | | | |
* | | | | | Merge pull request #11757 from ryog/fix_document_active_model_errorsRafael Mendonça França2013-08-051-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix: documentation for ActiveModel::Errors [ci skip]
| * | | | | Fix: documentation for ActiveModel::ErrorsRyoji Yoshioka2013-08-051-4/+4
|/ / / / /
* | | | | Merge pull request #11751 from rmm5t/assert_dom_equal-messageRafael Mendonça França2013-08-042-4/+11
|\ \ \ \ \ | | | | | | | | | | | | Pass assert_dom_equal message arg to underlying assertion
| * | | | | Pass assert_dom_equal message arg to underlying assertionRyan McGeary2013-08-042-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #assert_dom_equal and #assert_dom_not_equal both take a "failure" message argument, but this argument was not utilized.
* | | | | | Add CHANGELOG entry for #11665Rafael Mendonça França2013-08-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #11665 from mshytikov/fix-config-log_levelRafael Mendonça França2013-08-043-2/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rails.logger should have level specified by config.log_level.
| * | | | | | fix testsMax Shytikov2013-07-301-1/+1
| | | | | | |
| * | | | | | Rails.logger should have level specified by config.log_level. Max Shytikov2013-07-302-1/+10
| | | | | | | | | | | | | | | | | | | | | Fix bug when log level of Rails.logger (which was set via config.logger) does not match the config.log_level.
* | | | | | | Merge pull request #11677 from jaggederest/masterRafael Mendonça França2013-08-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCookieStore
| * | | | | | | remove language about configuring digest method [ci skip]Justin George2013-07-311-1/+1
| | | | | | | |
| * | | | | | | update guide to reflect default HMAC SHA1 in MessageVerifier used in ↵Justin George2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SignedCookieStore [ci skip]
* | | | | | | | Merge pull request #11693 from egilburg/minor_relation_refactorRafael Mendonça França2013-08-041-38/+45
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Minor optimization and code cleanup in query_methods.rb
| * | | | | | | | Minor optimization and code cleanup in query_methods.Eugene Gilburg2013-07-311-38/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use symbols rather than strings where possible to avoid extra object construction - Use destructive methods where possible to avoid extra object construction - Use array union rather than concat followed by uniq - Use shorthand block syntax where possible - Use consistent multiline block styles, method names, method parenteses style, and spacing
* | | | | | | | | Merge pull request #11749 from Alamoz/getting_started_guideRafael Mendonça França2013-08-041-0/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added to 'Security' section in 'Getting Started with Rails' guide, including reference to 'Ruby on Rails Security Guide'.
| * | | | | | | | | Added to 'Security' section; especially reference to 'Ruby on Rails Security ↵Adrien Lamothe2013-08-041-0/+15
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Guide'. [ci skip]
* | | | | | | | | Merge pull request #11737 from tkhr/fix-document-about-on-validation-helpersRafael Mendonça França2013-08-041-3/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix active_record_validations.md document, `:save` for `on:` validation helper was never available
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 10:38:48 +0000