aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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
| * | | | | | | | | | Add "extname" option to javascript_include_tagNathan Stitt2013-08-033-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers.asset_path is where the logic for javascript_include_tag resides. It takes an extname option for specifying the extension or false to not append it. This exposes that option to javascript_include_tag. Without the option files that didn't end with ".js" would get the extension appended to them. This broke JST templates and other file types that should be interpreted as JavaScript but who's file extension isn't ".js"
* | | | | | | | | | | Merge pull request #11741 from Karunakar/failing_test_in_localRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix for postgresql failing test in local
| * | | | | | | | | | | fix for postgresql failing test in localKarunakar (Ruby)2013-08-041-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #11730 from neerajdotname/use_flat_mapYves Senn2013-08-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | use flat_map
| * | | | | | | | | | use flat_mapNeeraj Singh2013-08-031-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #11736 from gaurish/avoid-multibyte-method-defineGuillermo Iguaran2013-08-031-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | [JRuby] Avoid calling define_method with non-english chars in InflectorTest
| * | | | | | | | | Avoid calling define_method with non-english chars in InflectorTestGaurish Sharma2013-08-031-3/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we call define_method with non-english chars like ¿por qué? it errors out on JRuby as of 1.7.4 & would leave out the following error invalid byte sequence in US-ASCII To work around this issue, I have switched to define_test method call define method with fixed string & the index of the hash. the index was added because otherwise, ruby will raise method redefined warning. As far as I can see there are no side-effect of this change for other implementations. For readbility I have added a message to asssert_equal informing for which word/phase the test has passed. Before this Change: JRuby: Tests terminated suddenly with an error. no reported of Failues or errors MRI: All Green. After this Change, JRuby: the `ActiveSupport` TestsSuite gracefully fails with report at the end which test failed & why. MRI: All Green(no change)
* | | | | | | | | Merge pull request #11735 from arunagw/av-warning-removed-masterYves Senn2013-08-031-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Using URI.parser.unescape
| * | | | | | | | Using URI.parser.unescapeArun Agrawal2013-08-031-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes warning warning: URI.unescape is obsolete
* | | | | | | | Revert "Isolate railties Generators Tests"Guillermo Iguaran2013-08-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes railties tests in JRuby but break it in MRI This reverts commit fea99276c7024f183bf72a16ad9f36af4bae1d42.
* | | | | | | | Merge pull request #11726 from atambo/isolate_generator_testsGuillermo Iguaran2013-08-021-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Isolate railties Generators Tests
| * | | | | | | | Isolate railties Generators TestsAlex Tambellini2013-08-021-0/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | With this change jruby should pass all of the railties tests.
* | | | | | | | add a test for concat on hm:t associationsAaron Patterson2013-08-021-0/+7
| | | | | | | |
* | | | | | | | Merge pull request #11721 from gaurish/join-timeoutGuillermo Iguaran2013-08-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add timeout to test_async_stream
| * | | | | | | | Add timeout to test_async_streamGaurish Sharma2013-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without timeout: this test executed infinitely on JRuby Passes on MRI With Timeout: this test gracefully fails on JRuby Passes on MRI, tested on v2.0 & v1.9.3
* | | | | | | | | Merge pull request #11725 from atambo/jruby_capture_unlinkGuillermo Iguaran2013-08-021-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix jruby warning when capture calls unlink on an open tempfile
| * | | | | | | | | Fix jruby warning when capture calls unlink on an open tempfileAlex Tambellini2013-08-021-0/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Jruby cannot unlink a tempfile unless it is closed first.
* | | | | | | | | Merge pull request #11712 from atambo/activesupport_testing_isolation_jrubyRafael Mendonça França2013-08-021-48/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix ActiveSupport::Testing::Isolation on jruby
| * | | | | | | | | Fix ActiveSupport::Testing::Isolation on jrubyAlex Tambellini2013-08-021-48/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully the first of many related to #11700. With these changes the railties tests wont 100% pass but at least they will run and show the errors. The first problem was the @method_name variable was never set. This was causing ENV["ISOLATION_TEST"] to always be nil which would cause the test output to never be written to the tempfile. The second problem was that an invalid -t option was being passed to minitest and minitest was erroring out. The third problem was the run method needs to always return an instance of the test class it is trying to isolate. We were returning a ProxyTestResult instead.
* | | | | | | | | | Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-testRafael Mendonça França2013-08-021-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | As we are doing debug mode on