| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | | |||||
| * | | | | Merge pull request #13111 from akshay-vishnoi/typo | Carlos Antonio da Silva | 2013-11-30 | 5 | -7/+7 |
| |\ \ \ \ | |/ / / |/| | | | Typo fixes [ci skip] | ||||
| | * | | | Typo fixes [ci skip] | Akshay Vishnoi | 2013-11-30 | 5 | -7/+7 |
| | | | | | |||||
| * | | | | Merge pull request #13107 from chancancode/has_one_counter_cache_should_raise | Yves Senn | 2013-11-30 | 5 | -2/+25 |
| |\ \ \ \ | | | | | | | | | | | Raise `ArgumentError` when `has_one` is used with `counter_cache` | ||||
| | * | | | | Raise `ArgumentError` when `has_one` is used with `counter_cache` | Godfrey Chan | 2013-11-29 | 5 | -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-fix | Rafael Mendonça França | 2013-11-29 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | Fixes failing test for JRuby | ||||
| | * | | | | Fixes failing test for JRuby | Arun Agrawal | 2013-11-29 | 1 | -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 Senn | 2013-11-29 | 1 | -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_delegate | Rafael Mendonça França | 2013-11-29 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Improve Module#delegate documentation. | ||||
| | * | | | | Improve Module#delegate documentation to tell that delegate don't work with ↵ | Lauro Caetano | 2013-11-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | private or protected methods. [ci skip] | ||||
| * | | | | | Merge pull request #13104 from christophemaximin/fix_robots_txt_link | Yves Senn | 2013-11-29 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix URL to robots.txt documentation [ci skip] | ||||
| | * | | | | | Fix URL to robots.txt documentation | Christophe Maximin | 2013-11-29 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #13097 from arunagw/jruby-test-fixes | Yves Senn | 2013-11-29 | 1 | -1/+7 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Skipping debugger inclusion test if JRuby | ||||
| | * | | | | | Checking no debugger on JRuby | Arun Agrawal | 2013-11-29 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | fixes tests for JRuby | ||||
| * | | | | | | Merge pull request #13102 from akshay-vishnoi/typo | Yves Senn | 2013-11-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | Typo fix | ||||
| | * | | | | | Typo fix | Akshay Vishnoi | 2013-11-29 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Remove unused variable | Rafael Mendonça França | 2013-11-29 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | This method is not using the block variable directly since it is calling yield | ||||
| * | | | | | Merge pull request #13095 from kuldeepaggarwal/test-case-updation | Yves Senn | 2013-11-29 | 2 | -9/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | removed unnecessary test case | ||||
| | * | | | | | updating options documentation for associations | Kuldeep Aggarwal | 2013-11-29 | 2 | -9/+8 |
| | | |/ / / | |/| | | | | | | | | | | | | | removed unnecessary test case and improved test case for belongs_to having invalid options | ||||
| * | | | | | Merge pull request #13099 from kamipo/remove_case_sensitive_equality_operator | Carlos Antonio da Silva | 2013-11-29 | 1 | -4/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been deprecated already. | ||||
| | * | | | | | Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been ↵ | Ryuta Kamizono | 2013-11-29 | 1 | -4/+0 |
| | | |/ / / | |/| | | | | | | | | | | | | | deprecated already. | ||||
| * | | | | | Merge pull request #13100 from akshay-vishnoi/f-refactor | Carlos Antonio da Silva | 2013-11-29 | 1 | -3/+8 |
| |\ \ \ \ \ | |/ / / / |/| | | | | #type_cast - improve performance & readability | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |