aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #16212 from ↵Rafael Mendonça França2014-07-181-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | aantix/additional_migration_conflict_help_messaging Additional help messaging to help the user resolve a conflicted migration
| * | | | Modified migration conflict message to remove the string concatenation.Jim Jones2014-07-181-3/+3
| | | | |
| * | | | Added additional help messaging when there's scaffolding being generated and ↵Jim Jones2014-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option.
* | | | | Merge pull request #16221 from arthurnn/14886_prGodfrey Chan2014-07-184-2/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | Cleanup + CHANGELOG for pr #14886
| * | | | Add CHANGELOG for #14886Arthur Neves2014-07-182-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleanup test a bit [related #14886] [related #14743]
| * | | | LOCALHOST definition should match any 127.0.0.0/8 addressEarl J St Sauver2014-07-183-2/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entire 127.0.0.0/8 range is assigned to the loopback address, not only 127.0.0.0/24. This patch allows ActionDispatch::Request::LOCALHOST to match any IPv4 127.0.0.0/8 loopback address. The only place that the #local? method was previously under test was in the show_expectations_test.rb file. I don't particularly like that that's implicitly where this code is under test, and I feel like I should move some of that testing code into the test/dispatch/request_test.rb file, but I wanted some feedback first. Credit goes to @sriedel for discovering the issue and adding the patch.
* | | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-183-10/+27
|\ \ \ \ | | | | | | | | | | | | | | | Dont swallow errors when bad alias_method
| * | | | Dont swallow errors when bad alias_methodArthur Neves2014-06-243-10/+27
| | | | |
* | | | | Follow-up to #16097 [ci skip]Robin Dupret2014-07-182-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if this is not exactly the same, let's add a new-line character instead of two spaces. While it's specified in the Markdown specs that adding spaces at the end of the line creates a break-line tag, this is a brittle approach as people may remove them saving the file on certain editors.
* | | | | Merge pull request #16099 from tgxworld/pass_log_as_blockYves Senn2014-07-185-43/+46
|\ \ \ \ \ | |_|/ / / |/| | | | Prefer to pass block when logging.
| * | | | Prefer to pass block when logging.Guo Xiang Tan2014-07-185-43/+46
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Logger by default includes a guard which checks for the logging level. By removing the custom logging guards, we can decouple the logging guard from the logging action to be done. This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
* | | | reporting is only done in one thread, so we can safely remove the lockAaron Patterson2014-07-171-1/+1
| | | | | | | | | | | | | | | | (I think)
* | | | %i doesn't work on 1.9Aaron Patterson2014-07-171-1/+1
| | | |
* | | | fix thread safety issuesAaron Patterson2014-07-171-4/+7
| | | | | | | | | | | | | | | | | | | | this test case had a race condition where it could download data multiple times. We'll download the data once at class load.
* | | | pass the test reporter by referenceAaron Patterson2014-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | this prevents the array from being dumped as a DRbObject so we can reduce communication with the server. the reporter should always exist on the server side, so we don't have to worry about GC
* | | | Merge pull request #16210 from sonnym/assert_valid_keys_in_validateMatthew Draper2014-07-183-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | Check for valid options in validate method
| * | | | check for valid options in validate methodsonnym2014-07-173-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prevents a certain class of user error which results when mistakenly using the `validate` class method instead of the `validates` class method. Only apply when all arguments are symbols, because some validations use the `validate` method and pass in additional options, namely the `LenghValidator` via the `ActiveMode::Validations::validates_with` method.
* | | | | fix filesystem race conditionAaron Patterson2014-07-171-1/+1
| | | | |
* | | | | do not restart the service, just stop itAaron Patterson2014-07-171-1/+0
| | | | |
* | | | | only parallelize on forking systemsAaron Patterson2014-07-171-1/+1
| | | | |
* | | | | Disable some tests on SQLiteRafael Mendonça França2014-07-171-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | These tests were passing before because the precision were not using to cast the value. Not it is being used so it would fail on sqlite3
* | | | | Prefer if/else for this caseRafael Mendonça França2014-07-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | One of the branches is using a proc to check if the value respond_to a method so it is better to not do case comparations
* | | | | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_castRafael Mendonça França2014-07-173-9/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix rational to decimal on type_cast_from_user
| * | | | | Fix decimal_test module and add new test for object responding to to_dMariano Valles2014-07-162-7/+15
| | | | | |
| * | | | | Fix case statement to use ::Numeric and ::StringMariano Valles2014-07-163-18/+25
| | | | | |
| * | | | | Change class evaluation for Rationals in cast_valueMariano Valles2014-07-162-5/+7
| | | | | |
| * | | | | Fix rational to decimal on type_cast_from_userMariano Valles2014-07-162-1/+13
| | | | | |
* | | | | | [EXPERIMENTAL] run actionpack tests in parallelAaron Patterson2014-07-171-0/+57
| |/ / / / |/| | | | | | | | | | | | | | | | | | | only on forking systems though. Feel free to revert this if it causes problems.
* | | | | `recall` should be `path_parameters`, also make it requiredAaron Patterson2014-07-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "recall" is a terrible name. This variable contains the parameters that we got from the path (e.g. for "/posts/1" it has :controller => "posts", :id => "1"). Since it contains the parameters we got from the path, "path_parameters" is a better name. We always pass path_parameters to `generate`, so lets make it required.
* | | | | pass the route name to define_url_helperAaron Patterson2014-07-173-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | this allows us to avoid 2 hash allocations per named helper definition, also we can avoid a `merge` and `delete`.
* | | | | Make restore_attributes publicRafael Mendonça França2014-07-172-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make it accept a list of attributes to be changed. This will make possible to restore only a subset of the changed attributes. Closes #16203
* | | | | use a strategy object for generating urls in named helpersAaron Patterson2014-07-172-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we know that the route should be a path or fully qualified, we can pass a strategy object that handles generation. This allows us to eliminate an "if only_path" branch when generating urls.
* | | | | helper methods are public, so we can just call themAaron Patterson2014-07-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | also if you want a path from a named helper, you should call helper_path, not helper_url(:only_path => true).
* | | | | docs, `select` and friends with `multiple=true` include a blank string.Yves Senn2014-07-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Jonas Baumann & Yves Senn] The submitted params from a select with `multiple: true` look as follows: ``` {post: {category: [""]}} {post: {category: ["", "Category 1", "Category 2"]}} ``` This is a follow up to #1552.
* | | | | Merge pull request #16198 from eileencodes/remove-need-for-macro-instance-varMatthew Draper2014-07-181-11/+14
|\ \ \ \ \ | | | | | | | | | | | | Remove need for macro instance var
| * | | | | Remove need for macro instance vareileencodes2014-07-171-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as we did for collection, removed the `@macro` instance var and it is now set in each association. Unfortunately it can't be left undefined in AssociationReflection so it has to be set there. For now I am setting it to NotImplementedError since there is no default macro and it changes based on the reflection type.
* | | | | | Merge pull request #16205 from davejachimiak/remove_profile_and_benchmark_pointMatthew Draper2014-07-171-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove "profile and benchmark" line from command line guide
| * | | | | Remove "profile and benchmark" line from command line guideDave Jachimiak2014-07-171-1/+0
|/ / / / / | | | | | | | | | | | | | | | The profiling and benchmarking commands are no longer built into Rails.
* | | | | Merge pull request #16201 from noinkling/masterGodfrey Chan2014-07-161-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix broken list formatting in API docs [ci skip]
| * | | | | Fix broken list formatting [ci skip]noinkling2014-07-171-5/+5
| | | | | |
* | | | | | subclass Rails::EngineAaron Patterson2014-07-161-1/+2
|/ / / / /
* | | | | extract path building to a methodAaron Patterson2014-07-161-9/+11
| | | | |
* | | | | break out path building logic to methodsAaron Patterson2014-07-161-14/+22
| | | | |
* | | | | only extract :params from the options hash onceAaron Patterson2014-07-161-3/+2
| | | | |
* | | | | we do not need to dup the options hash, it is private and a new object each callAaron Patterson2014-07-161-2/+2
| | | | |
* | | | | push rails app testing upAaron Patterson2014-07-161-9/+13
| | | | | | | | | | | | | | | | | | | | this way we only have to test for whether it is a rails app once.
* | | | | Rails-ish apps should descend from Rails::RailtieAaron Patterson2014-07-164-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Use an is_a check to ensure it's a Railsish app so we can avoid respond_to calls everywhere.
* | | | | app should always be a class (I suppose)Aaron Patterson2014-07-161-1/+1
| | | | |
* | | | | we should be checking if the app is a classAaron Patterson2014-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Hopefully `object.class` always returns something that is_a?(Class), so the previous logic didn't really make sense.
* | | | | Merge pull request #16197 from cgriego/patch-1Rafael Mendonça França2014-07-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unused 1:1 association :remote option
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 16:45:44 +0000