| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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`. | ||||
| * | | | | Merge pull request #6078 from lest/patch-4 | José Valim | 2012-04-30 | 1 | -0/+11 |
| |\ \ \ \ | | | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973 | ||||
| | * | | | | allow send_file/send_data to skip disposition header, closes #2973 | Sergey Nartimov | 2012-04-30 | 1 | -0/+11 |
| | |/ / / | |||||
| * / / / | wrap translate defaults to use translate helper features, closes #1102 | Sergey Nartimov | 2012-04-30 | 2 | -1/+25 |
| |/ / / | |||||
| * | | | Remove `button_to_function` and `link_to_function` helpers | Rafael Mendonça França | 2012-04-30 | 1 | -30/+0 |
| | | | | |||||
| * | | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Remove some unused variable assignments | ||||
| | * | | | Remove unused assignment in actionpack date helper test | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 1 | -1/+32 |
| | | | | | |||||
| * | | | | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 1 | -0/+29 |
| | | | | | |||||
| * | | | | Add failing test case for #6053 | Andrew White | 2012-04-29 | 1 | -0/+21 |
| | | | | | |||||
| * | | | | Merge pull request #6059 from rafaelfranca/check_box_inverted | José Valim | 2012-04-29 | 1 | -2/+98 |
| |\ \ \ \ | | | | | | | | | | | Change check_box to work inverting the checked and unchecked value | ||||
| | * | | | | Change check_box to work inverting the checked and unchecked value | Rafael Mendonça França | 2012-04-29 | 1 | -2/+98 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995 | ||||
| * | | | | Allow access to current object_counter variable from layout when rendering ↵ | Carlos Antonio da Silva | 2012-04-29 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | with partial + collection | ||||
| * | | | | Allow layout to access current object being rendered when using render ↵ | Carlos Antonio da Silva | 2012-04-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | partial + object | ||||
| * | | | | Allow layout rendering to access current object being rendered when using ↵ | Carlos Antonio da Silva | 2012-04-29 | 2 | -2/+7 |
| |/ / / | | | | | | | | | | partial + collection | ||||
| * | / | Add changelog entry for jsonp mimetype change, fix failing test | Carlos Antonio da Silva | 2012-04-29 | 1 | -1/+1 |
| | |/ |/| | | | | | Fix failing test: Mime::JS generates "text/javascript" | ||||
| * | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 1 | -2/+40 |
| | | | |||||
| * | | Merge pull request #2321 from omjokine/master | José Valim | 2012-04-29 | 1 | -1/+1 |
| |\ \ | | | | | | | JSONP should use mimetype application/javascript | ||||
| | * \ | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 74 | -429/+1708 |
| | |\ \ | |||||
| | * | | | fixed test case test_render_json_with_callback to use content_type ↵ | Olli Jokinen | 2011-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | application/javascript | ||||
| * | | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | closes #3341 | ||||
| * | | | | Merge session arg with existing session instead of overwriting | Andrew White | 2012-04-28 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529. | ||||
| * | | | | remove calls to deprecated find(:first) in actionpack test suite | Sergey Nartimov | 2012-04-26 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix the build | Yehuda Katz | 2012-04-25 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #5980 from gazay/valid_ips | Jeremy Kemper | 2012-04-25 | 1 | -20/+114 |
| |\ \ \ \ | | | | | | | | | | | Remote ip logic and validation. IPv6 support. | ||||
| | * | | | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ↵ | Alexey Gaziev | 2012-04-25 | 1 | -20/+114 |
| | | | | | | | | | | | | | | | | | | | | | tests. | ||||
| * | | | | | Remove default match without specified method | Jose and Yehuda | 2012-04-24 | 39 | -341/+341 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964 | ||||
| * | | | | | Use leap years trick in distance_of_time_in_words only for distances between ↵ | Alexey Vakhov | 2012-04-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | real date points | ||||
| * | | | | | fixed non matching documentation behaviour with method semantics on ↵ | Marcelo Casiraghi | 2012-04-24 | 1 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | | distance_of_time_in_words | ||||
| * | | | | | Distance of time in words should work correct if from time > to_time | Alexey Vakhov | 2012-04-24 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #5865 from tiegz/minor_fixes | Aaron Patterson | 2012-04-20 | 1 | -34/+21 |
| |\ \ \ \ | | | | | | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | ||||
| | * | | | | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 1 | -39/+17 |
| | | | | | | |||||
| | * | | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Remove unused test code. | Rafael Mendonça França | 2012-04-16 | 1 | -5/+0 |
| |/ / / / | | | | | | | | | | | | | | | | | ActionController::RoutingError are raised in router execution time and can not be rescued in a controller. | ||||
| * | | | | Merge pull request #5746 from jmbejar/index_method_form_builder | Santiago Pastorino | 2012-04-11 | 1 | -0/+50 |
| |\ \ \ \ | | | | | | | | | | | Add method FormBuilder#index | ||||
| | * | | | | Add index method to FormBuilder. Useful when you use field_for and need to ↵ | Jorge Bejar | 2012-04-11 | 1 | -0/+50 |
| | | | | | | | | | | | | | | | | | | | | | know the index number into the iteration. | ||||
| * | | | | | Adding itemscope to list of boolean attributes. | Frankie Roberto | 2012-04-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'itemscope' is defined within HTML5 for use in microdata markup. See http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht ml#attr-itemscope | ||||
| * | | | | | Merge pull request #5783 from rafaelfranca/default_url_options | Santiago Pastorino | 2012-04-08 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Document that default_url_options must return a hash with symbolized keys | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |