| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 1 | -0/+7 |
| | | |||||
| * | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 1 | -0/+6 |
| | | |||||
| * | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 1 | -14/+22 |
| | | |||||
| * | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 1 | -0/+21 |
| |\ | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | ||||
| | * | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 1 | -0/+21 |
| | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | ||||
| * | | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 1 | -2/+2 |
| | | | |||||
| * | | Remove useless load path modifications | Santiago Pastorino | 2012-05-11 | 2 | -9/+0 |
| | | | |||||
| * | | Copy literal route constraints to defaults - fixes #3571 and #6224. | Andrew White | 2012-05-11 | 2 | -3/+45 |
| | | | |||||
| * | | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 1 | -0/+35 |
| | | | |||||
| * | | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 1 | -0/+80 |
| |/ | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly | ||||
| * | Refactor Generator class to not rely on in-place editing the controller | Andrew White | 2012-05-09 | 1 | -6/+6 |
| | | |||||
| * | Fix bug when url_for changes controller. | Nikita Beloglazov | 2012-05-09 | 1 | -0/+9 |
| | | |||||
| * | Add failing test re #3436 which demonstrates content_type is not respected ↵ | Kunal Shah | 2012-05-08 | 1 | -0/+21 |
| | | | | | when using the :head method/shortcut | ||||
| * | Add passing tests for generating URLs with nested SCRIPT_NAMEs | Jeremy Kemper | 2012-05-07 | 2 | -3/+17 |
| | | |||||
| * | Merge pull request #5368 from andhapp/remove-max-stale | José Valim | 2012-05-07 | 1 | -4/+4 |
| |\ | | | | | Minor test improvement | ||||
| | * | Removed max-stale from the tests since it's a request cache-control ↵ | Anuj Dutta | 2012-03-10 | 1 | -4/+4 |
| | | | | | | | | | directive, just for clarity sake. | ||||
| * | | Fix that optimized named routes should also work as singleton methods on the ↵ | Jeremy Kemper | 2012-05-06 | 1 | -0/+24 |
| | | | | | | | | | url_helpers module | ||||
| * | | added an integration test that checks ActionController::UnknownFormat ↵ | Steven Soroka | 2012-05-06 | 1 | -0/+9 |
| | | | | | | | | | renders 406 :not_acceptable | ||||
| * | | Raise a rescuable exception when Rails doesn't know what to do with the ↵ | Steven Soroka | 2012-05-06 | 1 | -13/+19 |
| | | | | | | | | | format, rather than responding with a head :not_acceptable (406) | ||||
| * | | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 1 | -0/+9 |
| | | | |||||
| * | | Merge pull request #4445 from nragaz/role_based_params_wrapping | José Valim | 2012-05-04 | 1 | -2/+15 |
| | | | | | | | | | specify a role for identifying accessible attributes when wrapping params | ||||
| * | | Improve assert_template layout checking | Alexey Vakhov | 2012-05-04 | 1 | -0/+15 |
| | | | |||||
| * | | Fix assert_template :layout => nil assertion | Alexey Vakhov | 2012-05-04 | 1 | -0/+12 |
| | | | |||||
| * | | Fix assert_template assertion with :layout option | Alexey Vakhov | 2012-05-04 | 2 | -0/+12 |
| | | | |||||
| * | | Force given path to http methods in mapper to skip canonical action checking | Carlos Antonio da Silva | 2012-05-04 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following scenario: resources :contacts do post 'new', action: 'new', on: :collection, as: :new end Where the /new path is not generated because it's considered a canonical action, part of the normal resource actions: new_contacts POST /contacts(.:format) contacts#new Fixes #2999 | ||||
| * | | update invalid partial error message as per ↵ | Vijay Dev | 2012-05-04 | 1 | -4/+4 |
| | | | | | | | | | 04202a3f8d66c0675eac41fbf63309f4be356e81 | ||||
| * | | Merge branch 'master' into session | Aaron Patterson | 2012-05-04 | 5 | -1/+126 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (55 commits) extract deprecated dynamic methods Add some docs and changelog entry Allow overriding exception handling in threaded consumer Allow configuring a different queue consumer actually don't need to expand the aggregates at all #to_sym is unnecessary de-globalise method extract code from AR::Base clean up implementation of dynamic methods. use method compilation etc. Fix ActiveModel README example mention database mapping in getting started guide Remove vestiges of the http_only! config from configuring guide Remove content-length as well Make ActionController#head pass rack-link RouteSet: optimize routes generation when globbing is used Allows assert_redirected_to to accept a regular expression use extract_options! No need to force conversion to Symbol since case ensures it's already one. No need to work around 1.8 warnings anymore. Update command line guide ... | ||||
| | * \ | Merge pull request #6148 from twinturbo/head-fix | José Valim | 2012-05-03 | 1 | -0/+66 |
| | |\ \ | | | | | | | | | Make ActionController#head pass rack-link | ||||
| | | * | | Remove content-length as well | twinturbo | 2012-05-03 | 1 | -0/+6 |
| | | | | | |||||
| | | * | | Make ActionController#head pass rack-link | twinturbo | 2012-05-03 | 1 | -0/+60 |
| | | | | | |||||
| | * | | | Allows assert_redirected_to to accept a regular expression | Andy Lindeman | 2012-05-03 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Reset the request parameters after a constraints check | Andrew White | 2012-05-02 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. | ||||
| | * | | | Merge pull request #6125 from ncri/master | José Valim | 2012-05-02 | 1 | -1/+32 |
| | |\ \ \ | | | | | | | | | | | Adding proc evaluation for action caching layout parameter | ||||
| | | * | | | added proc evaluation for action cache's layout parameter | Nico | 2012-05-02 | 1 | -1/+32 |
| | | | | | | |||||
| | * | | | | Enable ActionDispatch::Http::Headers to support fetch | Mark Turner | 2012-05-02 | 1 | -0/+5 |
| | |/ / / | |||||
| * / / / | testing session store behavior | Aaron Patterson | 2012-05-02 | 2 | -0/+104 |
| |/ / / | |||||
| * | | | ActionPack: remove tests for hash_for_* methods | Bogdan Gusiev | 2012-05-02 | 1 | -18/+0 |
| | | | | |||||
| * | | | distance_of_time_in_words: Add/tweak comments to understand time intervals ↵ | Elliot Winkler | 2012-04-30 | 1 | -11/+20 |
| | | | | | | | | | | | | | better | ||||
| * | | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month | Elliot Winkler | 2012-04-30 | 1 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #5705 from lest/patch-3 | Jeremy Kemper | 2012-04-30 | 1 | -0/+5 |
| |\ \ | | | | | | | split CDATA end token in cdata_section helper | ||||
| | * | | split CDATA end token in cdata_section helper | Sergey Nartimov | 2012-04-30 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores | José Valim | 2012-04-30 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | Support cookie jar options for all cookie stores | ||||
| | * | | | Support cookie jar options for all cookie stores | brainopia | 2012-04-30 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Merge pull request #6082 from brainopia/smarter_cookie_jar | José Valim | 2012-04-30 | 1 | -8/+36 |
| |\ \ \ \ | |_|/ / |/| | | | Stream cookies only if needed | ||||
| | * | | | Dont stream back cookie value if it was set to the same value | brainopia | 2012-04-30 | 1 | -0/+12 |
| | | | | | |||||
| | * | | | Dont set cookie header for deletion of unexisting data | brainopia | 2012-04-30 | 1 | -8/+24 |
| | | | | | |||||
| * | | | | Merge pull request #3726 from JanDupal/fix-date-helper-hidden | José Valim | 2012-04-30 | 1 | -0/+32 |
| |\ \ \ \ | |/ / / |/| | | | fix Helpers::DateHelper with :use_hidden - hide separators | ||||
| | * | | | fix Helpers::DateHelper with :use_hidden - hide separators | Jan Dupal | 2011-11-22 | 1 | -0/+32 |
| | | | | | |||||
| * | | | | Merge pull request #6077 from ↵ | José Valim | 2012-04-30 | 2 | -37/+61 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash. | ||||
| | * | | | | Replace boolean argument with an options hash. | Dmitriy Kiriyenko | 2012-04-30 | 2 | -37/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |