aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #21263 from printercu/patch-1Rafael Mendonça França2015-08-171-1/+2
|\ \ \ \ | | | | | | | | | | Fixed syslog example in production config template
| * | | | Fixed syslog example in production config templateprintercu2015-08-171-1/+2
|/ / / /
* | | | Merge pull request #21135 from DropsOfSerenity/masterSean Griffin2015-08-176-19/+83
|\ \ \ \ | | | | | | | | | | make disable_with default in submit_tag
| * | | | Make disable_with default in submit_tagJustin Schiff2015-08-116-19/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents double submission by making disable_with the default. Default disable_with option will only be applied if user has not specified her/his own disable_with option, whether that is in the `data-disable-with` string form or the `:data => { :disable_with => "Saving..." }` hash form. disable_with will default to the value attribute. A configuration option was added to opt out of this functionality if the user so desires. `config.action_view.automatically_disable_submit_tag = false`
* | | | | Merge pull request #21258 from unfunco/plugin-semver-updateGuillermo Iguaran2015-08-163-4/+9
|\ \ \ \ \ | | | | | | | | | | | | Plugins are generated with the version 0.1.0
| * | | | | Updated tests for the generated version number changeDaniel Morris2015-08-161-3/+3
| | | | | |
| * | | | | Plugins are generated with the version 0.1.0Daniel Morris2015-08-162-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The semantic versioning specification uses MAJOR.MINOR.PATCH – it would make more sense to set the version to 0.1.0 for initial development since a patch release cannot be created before a minor feature release.
* | | | | | Fix typo on method nameRafael Mendonça França2015-08-161-3/+3
|/ / / / / | | | | | | | | | | | | | | | [Robin Dupret]
* | | | | Merge pull request #21253 from ↵Claudio B.2015-08-161-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vincefrancesi/date-helper-use-hidden-documentation Documentation for ActionView::Helpers::DateHelper :use_hidden option
| * | | | | Add documentation for ActionView::Helpers::DateHelper :use_hidden option [ci ↵Vince Francesi2015-08-151-0/+1
| | |/ / / | |/| | | | | | | | | | | | | skip]
* | | | | Add a changelog entry for #21124 [ci skip]Robin Dupret2015-08-161-0/+6
| | | | | | | | | | | | | | | | | | | | [Kir Shatrov & Robin Dupret]
* | | | | Tiny documentation fixes [ci skip]Robin Dupret2015-08-162-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing `def` and remove useless `do` keywords. * Move `:nodoc:` in front of the methods' definition so that methods under these ones are correctly visible on the API.
* | | | | move route allocation to a factory method on the mapping objectAaron Patterson2015-08-152-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I would like to change the signature of the Route constructor. Since the mapping object has all the data required to construct a Route object, move the allocation to a factory method.
* | | | | use the mapper to build the routing tableAaron Patterson2015-08-152-231/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should build the routes using the user facing API which is `Mapper`. This frees up the library internals to change as we see fit. IOW we shouldn't be testing internals.
* | | | | only process `via` onceAaron Patterson2015-08-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | we can directly turn it in to a regular expression here, so we don't need to test its value twice
* | | | | Fix test assign_parameter method signatureeileencodes2015-08-151-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, I broke the build :( Fixes the method signature of `assign_parameters` which now takes 6 arguments instead of 4. We likely will end up chaning the method signature further so good to know this test is here.
* | | | Refactor how assign_parameters sets generated_path & query_string_keyseileencodes2015-08-151-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a larger refactoring on controller tests. We needed to move these methods here so that we could get rid of the `|| key == :action || key == :controller` in `assign_parameters`. We know this is ugly and intend to fix it but for now `generate_extras` needs to be used in the two methods to access the path and the query_string_keys. We're adding `:controller` and `:action` to the `query_string_keys` because we always need a controller and action. If someone passed `action` or `controller` in in there test they are unambigious - we know they have to go into the query params.
* | | | Merge pull request #21248 from y-yagi/fix_deprecation_warning_in_aj_testRafael Mendonça França2015-08-151-1/+1
|\ \ \ \ | | | | | | | | | | use `average_scheduled_poll_interval` option instead of deprecated `poll_interval`
| * | | | use `average_scheduled_poll_interval` option instead of deprecated ↵yuuji.yaginuma2015-08-151-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `poll_interval` this removes the following warning: ``` DEPRECATION: `config.poll_interval = 0.5` will be removed in Sidekiq 4. Please update to `config.average_scheduled_poll_interval = 0.5`. ```
* | | | Merge pull request #21247 from maclover7/rdoc-to-mdRafael Mendonça França2015-08-151-37/+47
|\ \ \ \ | | | | | | | | | | Convert Releasing Rails guide to Markdown
| * | | | Convert Releasing Rails guide to Markdownmaclover72015-08-151-37/+47
| |/ / /
* | | | Merge pull request #21249 from rodzyn/initialize_symbolsRafael Mendonça França2015-08-151-2/+2
|\ \ \ \ | |/ / / |/| | | Initialize symbols instead of mapping to_sym on the set of strings
| * | | Initialize symbols instead of mapping to_sym on the set of stringsMarcin Olichwirowicz2015-08-151-2/+2
|/ / /
* | | only keep one hash of named routesAaron Patterson2015-08-145-19/+18
| | | | | | | | | | | | | | | The outer router object already keeps a hash of named routes, so we should just use that.
* | | Merge pull request #21240 from piton4eg/patch-5Claudio B.2015-08-141-10/+10
|\ \ \ | | | | | | | | Small fixes [ci skip]
| * | | Small fixes [ci skip]Alexey Markov2015-08-151-10/+10
| | | |
* | | | rm add_route2Aaron Patterson2015-08-144-49/+53
| | | | | | | | | | | | | | | | | | | | refactor the tests with a backwards compatible method call so we can rm add_route2 from the journey router
* | | | pass pass the mapping object down the add_route stackAaron Patterson2015-08-144-56/+73
| | | | | | | | | | | | | | | | | | | | then we can let the mapping object derive stuff that the Route object needs.
* | | | pass the mapping object to build_routeAaron Patterson2015-08-143-26/+15
| | | | | | | | | | | | | | | | | | | | now that we aren't doing options manipulations, we can just pass the mapping object down and read values from it.
* | | | remove `process_path`Aaron Patterson2015-08-141-6/+2
|/ / / | | | | | | | | | | | | since we've extracted the `to` initialization, there's no need for `process_path`
* | | explicitly return nil from `get_to_from_path`Aaron Patterson2015-08-141-3/+3
| | | | | | | | | | | | | | | | | | if `to` was initialized, this method would return, so we can eliminate the to ||= in the conditional. Finally, let's return a nil in the else block so that it's explicit that this method can return nil
* | | extract method on determining :to from the pathAaron Patterson2015-08-141-5/+9
| | | | | | | | | | | | Eventually we'll pull this up and delete `process_path`.
* | | deprecate passing a string for both the beginning path and :path optionAaron Patterson2015-08-142-2/+20
| | |
* | | rm path_params methodAaron Patterson2015-08-141-5/+1
| | | | | | | | | | | | | | | | | | We don't need a method for something like this. I want to pull this up the stack as well and move the module + :controller ArgumentError up the stack as well
* | | extract method on wildcard path parameter handlingAaron Patterson2015-08-141-6/+11
| | |
* | | pass the path ast downAaron Patterson2015-08-143-6/+4
| | | | | | | | | | | | | | | now we don't need to add it to a hash and delete it from the hash later just to pass it around
* | | pull up path parsingAaron Patterson2015-08-143-11/+12
| | | | | | | | | | | | | | | `add_route` needs the AST, so rather than shove it in a hash and delete later, lets move parsing up the stack so we can pass down later
* | | use predicate methods instead of hard coding verb stringsAaron Patterson2015-08-143-7/+7
| | | | | | | | | | | | | | | also change the feeler to subclass AD::Request so that it has all the methods that Request has
* | | remove hard coded regular expressionAaron Patterson2015-08-142-1/+5
| | |
* | | implement `requirements` in terms of routesAaron Patterson2015-08-141-1/+1
| | |
* | | implement the `asts` method in terms of paths / patternsAaron Patterson2015-08-141-12/+11
| | | | | | | | | | | | Eventually I want to eliminate the FakeSet test class
* | | extract ast finding to a methodAaron Patterson2015-08-141-9/+13
| | | | | | | | | | | | | | | I'm going to reimplement this using route objects, so it will be easier if we just change ast access to go through a method rather than hashes
* | | stop adding path_info to the conditions hashAaron Patterson2015-08-143-11/+9
| | | | | | | | | | | | we don't need to keep adding it and deleting if from hashes.
* | | pull up path normalization.Aaron Patterson2015-08-141-18/+18
| | | | | | | | | | | | | | | Eventually I want to pull up AST generation so that we don't have to add it to the `conditions` hash.
* | | Merge pull request #20647 from twalpole/method_source_dependencyRafael Mendonça França2015-08-142-0/+2
|\ \ \ | | | | | | | | Add method_source dependency to activesupport
| * | | Add method_source dependency to activesupportThomas Walpole2015-07-292-0/+2
| | | |
* | | | Remove install.rbRafael Mendonça França2015-08-141-13/+0
| | | | | | | | | | | | | | | | We already have rake install command that does the same thing.
* | | | Merge pull request #21234 from ↵Rafael Mendonça França2015-08-141-5/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ixkaito/version_is_needless_when_running_installrb Remove `version` argument in install.rb
| * | | | Remove `version` argument in install.rbKite2015-08-141-5/+2
| | | | |
* | | | | Merge pull request #21236 from jonatack/fix-middleware-deprecation-messagesKasper Timm Hansen2015-08-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix middleware deprecation message. Related to #21172.