aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* be more specific about csrf token and ajax - not whitelisted outside of ↵Tim Ruffles2013-08-061-2/+5
| | | | jquery-rails [ci skip]
* 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
| * | | | | Fix active_record_validations.md document, `:save` for `on:` validation ↵Takehiro Adachi2013-08-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helper was never available According to the guide, ":save" value for the "on:" validation helper was available like below validates :name, presence: true, on: :save but this was never available according to the implementation of the valid? method, which is below # Runs all the validations within the specified context. Returns +true+ if # no errors are found, +false+ otherwise. # # If the argument is +false+ (default is +nil+), the context is set to <tt>:create</tt> if # <tt>new_record?</tt> is +true+, and to <tt>:update</tt> if it is not. # # Validations with no <tt>:on</tt> option will run no matter the context. Validations with # some <tt>:on</tt> option will only run in the specified context. def valid?(context = nil) context ||= (new_record? ? :create : :update) output = super(context) errors.empty? && output end So the documentation was always wrong since the PR proposed by @neerajdotname ( #10287 ) was rejected.
* | | | | | No need to use blocks hereAndrew White2013-08-041-11/+9
| | | | | |
* | | | | | Fix unused variable warningAndrew White2013-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to call `in_time_zone` to test that it isn't modifying the receiver but since the variable isn't used it raises a warning so add an assertion to make Ruby think it's being used.
* | | | | | Remove "Using Action View outside of Rails" section from AV overview guideGuillermo Iguaran2013-08-041-69/+0
| | | | | | | | | | | | | | | | | | The section was clearly wrong and was just an example about how to use ActiveSupport helpers in Rack/Sinatra
* | | | | | :scissors:Rafael Mendonça França2013-08-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | No need to abbreviate applicationRafael Mendonça França2013-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #11747 from bradly/guides_getting_started_fixRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add note that you must be in the rails app when starting the server
| * | | | | | Add note that you must be in the rails app directory when starting up the ↵Bradly Feeley2013-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server. This is a response to issue #11731 and is a common mistake for people newer to rails that try forget to cd into the new rails app after running rails new.
* | | | | | | Merge pull request #11733 from iainbeeston/masterRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | i18n guide update: corrected reference to activerecord to instead reference activemodel
| * | | | | | | Updated the guide to say that the localisation file for validation messages ↵Iain Beeston2013-08-031-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | is in activemodel, not activerecord
* | | | | | | Merge pull request #11600 from jasiek/masterRafael Mendonça França2013-08-031-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed an unnecessary loop - it kills performance on large texts.
| * | | | | | | Removed an unnecessary loop - it kills performance on large texts.Jan Szumiec2013-08-031-4/+6
| | | | | | | |
* | | | | | | | Merge pull request #11738 from gaurish/guides-association-basics-fixRafael Mendonça França2013-08-031-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many
| * | | | | | | | [Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many[ci ↵Gaurish Sharma2013-08-031-2/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip] Done the following changes: 1. Replace uniq call in example with autosave as uniq is not supported on has_and_belongs_to_many 2. Add :readonly option to list of supported call as per [EdgeApi](http://edgeapi.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#method-i-has_and_belongs_to_many)
* | | | | | | | Merge pull request #11740 from Karunakar/self_tableRafael Mendonça França2013-08-031-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Changing the def self.table_name to self.table_name in the column_name.r...
| * | | | | | | Changing the def self.table_name to self.table_name in the column_name.rbKarunakar (Ruby)2013-08-031-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #11744 from Karunakar/minor_fix_on_flatmapRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | used flat_map instead of map.flatten in /guides/rails_guides/helpers.rb
| * | | | | | | | used flat_map instead of map.flatten in /guides/rails_guides/helpers.rbKarunakar (Ruby)2013-08-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #11707 from nathanstitt/extname_optionRafael Mendonça França2013-08-033-3/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | javascript_include_tag "extname" option for use by asset_path
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 02:16:49 +0000