aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | :scissors:Rafael Mendonça França2013-12-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Make the release notes consistent [ci skip]Rafael Mendonça França2013-12-021-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
* | | | | | | Make the tests break againRafael Mendonça França2013-12-021-2/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | We need to fix this test
* | | | | | activemodel isn't a runtime dependency for actionviewGuillermo Iguaran2013-12-021-2/+2
| | | | | |
* | | | | | Merge pull request #13134 from rubiii/patch-1Carlos Antonio da Silva2013-12-021-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | added missing require to active_support/tagged_logging
| * | | | | added missing requireDaniel Harrington2013-12-021-0/+1
|/ / / / / | | | | | | | | | | we’re using .delegate and should require it.
* | | | | `mail()` without arguments is a getter for the current mail.Yves Senn2013-12-023-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior is documented in our guides (http://edgeguides.rubyonrails.org/action_mailer_basics.html#action-mailer-callbacks) but was broken in the past. This commit short curcuits the `mail` method if: 1. mail() was previously called 2. no headers are passed 3. no block is passed Closes #13090. /cc @pixeltrix
* | | | | Merge pull request #13117 from akshay-vishnoi/typoXavier Noria2013-12-028-12/+12
|\ \ \ \ \ | | | | | | | | | | | | Typo and grammatical fixes [ci skip]
| * | | | | Typo and grammatical fixes [ci skip]Akshay Vishnoi2013-12-028-12/+12
| | | | | |
* | | | | | Merge pull request #11466 from jetthoughts/updated_tesing_guidesYves Senn2013-12-021-9/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `rake test` description in the guides [ci skip]
| * | | | | | Add `rake test:all`, `rake test:all:db` to guidePaul Nikitochkin2013-11-301-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | `ActionView::MissingTemplate` for partials includes underscore.Yves Senn2013-12-024-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing partial folder/_partial instead of folder/partial. Closes #13002.
* | | | | | | Merge pull request #12365 from jbaudanza/reorderGuillermo Iguaran2013-12-012-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack
| * | | | | | | Move Rack::Cache after AD::Static in the stackJonathan Baudanza2013-09-252-6/+6
| | | | | | | |
* | | | | | | | Update active_record_querying.mdGuillermo Iguaran2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | he or she => they
* | | | | | | | Cleanups in API docs: his => theirGuillermo Iguaran2013-12-021-2/+2
| | | | | | | |
* | | | | | | | Try to escape each part of a path redirect route correctlyAndrew White2013-12-023-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A path redirect may contain any and all parts of a url which have different escaping rules for each part. This commit tries to escape each part correctly by splitting the string into three chunks - path (which may also include a host), query and fragment; then it applies the correct escape pattern to each part. Whilst using `URI.parse` would be better, unfortunately the possible presence of %{name} parameters in the path redirect string prevents us from using it so we have to use a regular expression instead. Fixes #13110.
* | | | | | | | Merge pull request #13130 from gja/masterGuillermo Iguaran2013-12-013-9/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Removing some gender sensitive object pronouns
| * | | | | | | | [ci skip] Removing some gender sensitive object pronounsTejas Dinkar2013-12-023-9/+9
| | | | | | | | |
* | | | | | | | | Add examples for gender neutral pronounsGuillermo Iguaran2013-12-011-1/+7
| | | | | | | | |
* | | | | | | | | Update API docs guidelines with reference about gender neutral pronounsGuillermo Iguaran2013-12-011-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #13126 from vipulnsward/gender_neutral_pronounsAndrew White2013-12-011-18/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use gender - neutral pronouns in security guide.
| * | | | | | | | Use genderless pronouns in security guide. [ci skip]Vipul A M2013-12-021-18/+18
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | related #49ff20d9b164693ed7fee880b69cc14b141678b3
* | | | | | | | Merge pull request #10712 from prathamesh-sonpatki/plugin-railsrcGuillermo Iguaran2013-12-012-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use .railsrc while creating new plugin if available. Fixes #10700
| * | | | | | | | Use .railsrc while creating new plugin if availablePrathamesh Sonpatki2013-12-012-0/+19
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Fixes #10700
* | | | | | | | Merge pull request #13123 from chancancode/json_encoder_nodoc_fixYves Senn2013-12-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | JSON encoder internals showed up in docs [ci skip]
| * | | | | | | | EscapedString is also private API [ci skip]Godfrey Chan2013-12-011-1/+1
|/ / / / / / / /
* | | | | | | | Use genderless pronouns in API docsGuillermo Iguaran2013-12-012-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #11796 from thedarkone/time-zone-thread-safetyGuillermo Iguaran2013-11-301-13/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | AS::TimeZone's cache thread safety
| * | | | | | | | Remove AS::TZ.lookup(name).thedarkone2013-08-071-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method doesn't really make much sense (find_tzinfo will succeed for any imput provided).
| * | | | | | | | Unify AS::TZ's lazy init maps.thedarkone2013-08-071-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point in having 2 almost identical (@lazy_zones_map and @zones_map) lazy initialized TZ instance caches.
| * | | | | | | | Use TS::Cache instead plain Hash in TimeZone.thedarkone2013-08-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plain ruby Hashes are not thread safe.
* | | | | | | | | config.assets.enabled isn't used anymore to disable Rails asset pipelineGuillermo Iguaran2013-12-012-6/+0
| | | | | | | | |
* | | | | | | | | Honor to RAILS_GROUPS env variable while loading gems with BundlerGuillermo Iguaran2013-12-011-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #13121 from pftg/patch-1Guillermo Iguaran2013-11-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removed redundant field name in the guide
| * | | | | | | | | Removed redundant field name in the guide Paul Nikitochkin2013-12-011-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #13108 [ci skip]
* | | | | | | | | Merge pull request #13119 from sbagdat/patch-1Rafael Mendonça França2013-11-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update render with a spacer_template [ci skip]
| * | | | | | | | | Update render with a spacer_template [ci skip]Sıtkı Bağdat2013-12-011-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #13055 from ↵Rafael Mendonça França2013-11-302-0/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/fix-segmentation-fault-it-ruby-2.0.0-p353 Fix segmentation fault in Ruby 2.0.0-p353.
| * | | | | | | | | Fix segmentation fault in Ruby 2.0.0-p353.Dmitriy Kiriyenko2013-11-302-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.0.0-p353 there was a [commit](https://github.com/ruby/ruby/commit/66915c507777c5e3a978fa73de25db763efd9206) that switched case matching from actual sending `===` method to magic lookup, that does not see it in `method_missing`. It's hard to predict how exactly and when exactly this bug will be solved so here I suggest a solution of defining it in Duration directly. In Ruby 2.0.0-p353 without the added fix added test crashes to segmentation fault.
* | | | | | | | | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-11-301-9/+8
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13111 from akshay-vishnoi/typoCarlos Antonio da Silva2013-11-305-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | Typo fixes [ci skip]
| * | | | | | | | Typo fixes [ci skip]Akshay Vishnoi2013-11-305-7/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #13107 from chancancode/has_one_counter_cache_should_raiseYves Senn2013-11-305-2/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Raise `ArgumentError` when `has_one` is used with `counter_cache`
| * | | | | | | | | Raise `ArgumentError` when `has_one` is used with `counter_cache`Godfrey Chan2013-11-295-2/+25
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `has_one` macro incorrectly accepts the `counter_cache` option due to a bug, although that options was never supported nor functional on `has_one` and `has_one ... through` relationships. It now correctly raises an `ArgumentError` when passed that option. For reference, this bug was introduced in 52f8e4b9.
* | | | | | | | | Merge pull request #13105 from arunagw/jruby-gen-test-fixRafael Mendonça França2013-11-291-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes failing test for JRuby
| * | | | | | | | | Fixes failing test for JRubyArun Agrawal2013-11-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in JRuby FileUtils do not change current dir when moving files
* | | | | | | | | | add missing arel dependency to `active_record_master` bug report script.Yves Senn2013-11-291-0/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]. This solves: ``` Could not find gem 'arel (~> 5.0.0) ruby', which is required by gem 'rails (>= 0) ruby', in any of the sources. ```
* | | | | | | | | Merge pull request #13092 from laurocaetano/improve_documentation_for_delegateRafael Mendonça França2013-11-291-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve Module#delegate documentation.
| * | | | | | | | | Improve Module#delegate documentation to tell that delegate don't work with ↵Lauro Caetano2013-11-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private or protected methods. [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 23:46:07 +0000