Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13138 from gsamokovarov/remove-cattr-requires | Guillermo Iguaran | 2013-12-02 | 15 | -15/+15 |
|\ | | | | | Remove deprecated cattr_* requires | ||||
| * | Remove deprecated cattr_* requires | Genadi Samokovarov | 2013-12-03 | 15 | -15/+15 |
| | | |||||
* | | Add number and range field to form helpers article | Juanito Fatas | 2013-12-02 | 1 | -2/+16 |
| | | | | | | | | | | | | Also wrap surrounding text to 80 chars. [ci skip] Closes #13132 | ||||
* | | Make ActionView::Tags loading tread safe | Rafael Mendonça França | 2013-12-02 | 4 | -32/+40 |
|/ | |||||
* | Merge pull request #11197 from gsamokovarov/unify-mattr-cattr | Guillermo Iguaran | 2013-12-02 | 7 | -271/+196 |
|\ | | | | | Unify cattr and mattr accessors declarations | ||||
| * | Unify cattr and mattr accessors declarations | Genadi Samokovarov | 2013-12-02 | 7 | -271/+196 |
| | | |||||
* | | Wrap 80 columns [ci skip] | Rafael Mendonça França | 2013-12-02 | 1 | -5/+10 |
| | | |||||
* | | Add documentation about the Action Dispatch salt configuration | Rafael Mendonça França | 2013-12-02 | 1 | -0/+8 |
| | | | | | | | | [ci skip] | ||||
* | | Use alphabetic order | Rafael Mendonça França | 2013-12-02 | 1 | -2/+2 |
| | | | | | | | | [ci skip] | ||||
* | | :scissors: | Rafael Mendonça França | 2013-12-02 | 2 | -5/+5 |
| | | | | | | | | [ci skip] | ||||
* | | Make the release notes consistent [ci skip] | Rafael Mendonça França | 2013-12-02 | 1 | -66/+66 |
| | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md | ||||
* | | Make the tests break again | Rafael Mendonça França | 2013-12-02 | 1 | -2/+0 |
|/ | | | | We need to fix this test | ||||
* | activemodel isn't a runtime dependency for actionview | Guillermo Iguaran | 2013-12-02 | 1 | -2/+2 |
| | |||||
* | Merge pull request #13134 from rubiii/patch-1 | Carlos Antonio da Silva | 2013-12-02 | 1 | -0/+1 |
|\ | | | | | added missing require to active_support/tagged_logging | ||||
| * | added missing require | Daniel Harrington | 2013-12-02 | 1 | -0/+1 |
|/ | | | we’re using .delegate and should require it. | ||||
* | `mail()` without arguments is a getter for the current mail. | Yves Senn | 2013-12-02 | 3 | -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/typo | Xavier Noria | 2013-12-02 | 8 | -12/+12 |
|\ | | | | | Typo and grammatical fixes [ci skip] | ||||
| * | Typo and grammatical fixes [ci skip] | Akshay Vishnoi | 2013-12-02 | 8 | -12/+12 |
| | | |||||
* | | Merge pull request #11466 from jetthoughts/updated_tesing_guides | Yves Senn | 2013-12-02 | 1 | -9/+14 |
|\ \ | | | | | | | Fix `rake test` description in the guides [ci skip] | ||||
| * | | Add `rake test:all`, `rake test:all:db` to guide | Paul Nikitochkin | 2013-11-30 | 1 | -9/+14 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | `ActionView::MissingTemplate` for partials includes underscore. | Yves Senn | 2013-12-02 | 4 | -4/+13 |
| | | | | | | | | | | | | | | | | | | Missing partial folder/_partial instead of folder/partial. Closes #13002. | ||||
* | | | Merge pull request #12365 from jbaudanza/reorder | Guillermo Iguaran | 2013-12-01 | 2 | -6/+6 |
|\ \ \ | | | | | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack | ||||
| * | | | Move Rack::Cache after AD::Static in the stack | Jonathan Baudanza | 2013-09-25 | 2 | -6/+6 |
| | | | | |||||
* | | | | Update active_record_querying.md | Guillermo Iguaran | 2013-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | he or she => they | ||||
* | | | | Cleanups in API docs: his => their | Guillermo Iguaran | 2013-12-02 | 1 | -2/+2 |
| | | | | |||||
* | | | | Try to escape each part of a path redirect route correctly | Andrew White | 2013-12-02 | 3 | -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/master | Guillermo Iguaran | 2013-12-01 | 3 | -9/+9 |
|\ \ \ \ | | | | | | | | | | | Removing some gender sensitive object pronouns | ||||
| * | | | | [ci skip] Removing some gender sensitive object pronouns | Tejas Dinkar | 2013-12-02 | 3 | -9/+9 |
| | | | | | |||||
* | | | | | Add examples for gender neutral pronouns | Guillermo Iguaran | 2013-12-01 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | Update API docs guidelines with reference about gender neutral pronouns | Guillermo Iguaran | 2013-12-01 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #13126 from vipulnsward/gender_neutral_pronouns | Andrew White | 2013-12-01 | 1 | -18/+18 |
|\ \ \ \ | | | | | | | | | | | Use gender - neutral pronouns in security guide. | ||||
| * | | | | Use genderless pronouns in security guide. [ci skip] | Vipul A M | 2013-12-02 | 1 | -18/+18 |
|/ / / / | | | | | | | | | | | | | related #49ff20d9b164693ed7fee880b69cc14b141678b3 | ||||
* | | | | Merge pull request #10712 from prathamesh-sonpatki/plugin-railsrc | Guillermo Iguaran | 2013-12-01 | 2 | -0/+19 |
|\ \ \ \ | | | | | | | | | | | Use .railsrc while creating new plugin if available. Fixes #10700 | ||||
| * | | | | Use .railsrc while creating new plugin if available | Prathamesh Sonpatki | 2013-12-01 | 2 | -0/+19 |
|/ / / / | | | | | | | | | | | | | - Fixes #10700 | ||||
* | | | | Merge pull request #13123 from chancancode/json_encoder_nodoc_fix | Yves Senn | 2013-12-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | JSON encoder internals showed up in docs [ci skip] | ||||
| * | | | | EscapedString is also private API [ci skip] | Godfrey Chan | 2013-12-01 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Use genderless pronouns in API docs | Guillermo Iguaran | 2013-12-01 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #11796 from thedarkone/time-zone-thread-safety | Guillermo Iguaran | 2013-11-30 | 1 | -13/+7 |
|\ \ \ \ | | | | | | | | | | | AS::TimeZone's cache thread safety | ||||
| * | | | | Remove AS::TZ.lookup(name). | thedarkone | 2013-08-07 | 1 | -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. | thedarkone | 2013-08-07 | 1 | -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. | thedarkone | 2013-08-07 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | Plain ruby Hashes are not thread safe. | ||||
* | | | | | config.assets.enabled isn't used anymore to disable Rails asset pipeline | Guillermo Iguaran | 2013-12-01 | 2 | -6/+0 |
| | | | | | |||||
* | | | | | Honor to RAILS_GROUPS env variable while loading gems with Bundler | Guillermo Iguaran | 2013-12-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #13121 from pftg/patch-1 | Guillermo Iguaran | 2013-11-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed redundant field name in the guide | ||||
| * | | | | | Removed redundant field name in the guide | Paul Nikitochkin | 2013-12-01 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | Fixes: #13108 [ci skip] | ||||
* | | | | | Merge pull request #13119 from sbagdat/patch-1 | Rafael Mendonça França | 2013-11-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update render with a spacer_template [ci skip] | ||||
| * | | | | | Update render with a spacer_template [ci skip] | Sıtkı Bağdat | 2013-12-01 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #13055 from ↵ | Rafael Mendonça França | 2013-11-30 | 2 | -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 Kiriyenko | 2013-11-30 | 2 | -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 Silva | 2013-11-30 | 1 | -9/+8 |
| | | | | | |