Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #15058 from Gaurav2728/gaurav-doc_message | Richard Schneeman | 2014-05-11 | 1 | -3/+4 | |
|\ \ \ \ | | | | | | | | | | | adding complete message in documentation [ci skip] | |||||
| * | | | | adding complete message in documentation [ci skip] | Gaurav Sharma | 2014-05-11 | 1 | -3/+4 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' of github.com:rails/rails | Andrew White | 2014-05-11 | 1 | -0/+59 | |
|\ \ \ \ | ||||||
| * | | | | pg guide, PostgreSQL legacy table view example. [ci skip] | Yves Senn | 2014-05-11 | 1 | -0/+59 | |
| | | | | | ||||||
* | | | | | Always use the provided port for protocol relative urls | Andrew White | 2014-05-11 | 3 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | There may be situations where you need to tunnel SSL connections over port 80 so we shouldn't remove it if it has been explicitly provided. | |||||
* | | | | | ActionDispatch::Http::URL.normalize_port should not strip port for protocol ↵ | Guilherme Cavalcanti | 2014-05-11 | 2 | -2/+12 | |
|/ / / / | | | | | | | | | | | | | relative URL. | |||||
* | | | | docs, fix typo in docs added by ed56e596a04673. [ci skip] | Yves Senn | 2014-05-10 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #15056 from josemarluedke/single-quotes-on-plugin-gemfile | Rafael Mendonça França | 2014-05-10 | 2 | -7/+7 | |
|\ \ \ \ | | | | | | | | | | | Change Gemfile’s double quotation marks in plugin generator | |||||
| * | | | | Change Gemfile’s double quotes in plugin generator | Josemar Luedke | 2014-05-10 | 2 | -7/+7 | |
|/ / / / | | | | | | | | | | | | | | | | | Since the generated application’s Gemfile is using single quotation marks, it seems fair to use it on plugin’s Gemfile as well. | |||||
* | | | | Merge pull request #15054 from mechanicles/documentation-consistency | Rafael Mendonça França | 2014-05-10 | 1 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | Keep method's description/documentation consistent [ci skip] | |||||
| * | | | | Keep method's description/documentation consistent [ci skip] | Santosh Wadghule | 2014-05-11 | 1 | -3/+3 | |
|/ / / / | ||||||
* | | | | feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 | Aaron Patterson | 2014-05-10 | 1 | -5/+21 | |
| | | | | ||||||
* | | | | minor change in AR readme [ci skip] | Vijay Dev | 2014-05-10 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-05-10 | 6 | -11/+49 | |
|\ \ \ \ | ||||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2014-05-10 | 2 | -14/+13 | |
| | | | | | ||||||
| * | | | | [ci skip] add example to AR#assign_attributes | schneems | 2014-05-09 | 1 | -0/+10 | |
| | | | | | ||||||
| * | | | | [ci skip] doc ActiveSupport::TimeWithZone#to_s | schneems | 2014-05-09 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | Current docs are wrong. Does not accept strftime inputs. | |||||
| * | | | | [ci skip] doc Http::Headers methods | schneems | 2014-05-09 | 1 | -1/+17 | |
| | | | | | ||||||
| * | | | | fix formatting errors [ci skip] | Vijay Dev | 2014-05-09 | 1 | -6/+6 | |
| | | | | | ||||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2014-05-08 | 2 | -3/+2 | |
| | | | | | ||||||
| * | | | | [ci skip] document ActionDispatch::HTTP::Headers | schneems | 2014-05-07 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | [ci skip] document type_cast_for_write | schneems | 2014-05-07 | 2 | -0/+5 | |
| | | | | | ||||||
| * | | | | Fix Formatting in AR Readme | Gaurish Sharma | 2014-05-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Don't make free form text appear in code blocks [ci skip] | |||||
* | | | | | deprecate, join, preload, eager load of instance dependent associations. | Yves Senn | 2014-05-10 | 6 | -4/+56 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15024. These operations happen before instances are created. The current behavior is misleading and can result in broken behavior. | |||||
* | | | | | Merge pull request #15049 from arthurnn/fix_ci | Rafael Mendonça França | 2014-05-09 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix broken proc syntax for 1.9.3 | |||||
| * | | | | | Fix broken proc syntax for 1.9.3 | Arthur Neves | 2014-05-09 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | skip dealing with params if none are provided | Aaron Patterson | 2014-05-09 | 1 | -4/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us avoid 1. A slow call to Hash#slice 2. An is_a? test 3. Extra hash allocations (from slice) 4. String allocations etc. | |||||
* | | | | | don't mutate the options hash, so we don't have to dup | Aaron Patterson | 2014-05-09 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | avoids extra hash allocations on each call | |||||
* | | | | | use fnmatch to test for case insensitive file systems | Aaron Patterson | 2014-05-09 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is due to: https://bugs.ruby-lang.org/issues/5994 | |||||
* | | | | | use unless and || since these options are boolean | Aaron Patterson | 2014-05-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #15045 from xanhast/patch-1 | Godfrey Chan | 2014-05-09 | 1 | -2/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Documentation, add examples of using an Enum scope [ci skip] | |||||
| * | | | | | Documentation, add examples of using an Enum scope | Zac | 2014-05-09 | 1 | -2/+4 | |
|/ / / / / | | | | | | | | | | | When scanning the Enum API page I found it easy to miss that scopes are generated. Adding an example clarifies use and has more... *pop*... | |||||
* | | | | | test, regression test for has_many with instance dependent scope. | Yves Senn | 2014-05-09 | 2 | -0/+12 | |
| | | | | | ||||||
* | | | | | Merge pull request #15044 from zzak/travis_ruby_too_won | Rafael Mendonça França | 2014-05-09 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Only need MINOR version level to test Ruby 2.1.x on Travis | |||||
| * | | | | | Only need MINOR version level to test Ruby 2.1.x on Travis | Zachary Scott | 2014-05-09 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | cc http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/ | |||||
* | | | | | Merge pull request #15042 from arthurnn/revert_dirty_transactions | Rafael Mendonça França | 2014-05-09 | 3 | -52/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Reverts dirty track restore on transactions rollback | |||||
| * | | | | | Reverts "Fix bugs with changed attributes tracking when transaction gets ↵ | Arthur Neves | 2014-05-09 | 3 | -52/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rollback" We are reverting these commits, because there are other caveats related to dirty attributes not being restored when a transaction is rollback. For instance, nested transactions cannot proper restore the dirty attributes state after a rollback. At the moment, the dirty attributes are scoped by the transaction. When we call `.save` on a record, the dirty attributes will be reset even if the transaction gets rollback. [related #13166] [related #15018] [related #15016] [closes #15019] This reverts commits * bab48f0a3d53a08bc23ea0887219e8deb963c3d9 * b0fa7cf3ff8432cc2eef3682b34763b7f8c93cc8. * 73fb39b6faa9de593ae75ad4e3b8e065ea0e53af * 37c238927fbed059de3f26a90d8923fb377568a5. * 8d8d4f1560264cd1c74364d67fa0501f6dd2c4fa Revert "Merge pull request #13166 from bogdan/transaction-magic" | |||||
* | | | | | | just call the method and assert the return value | Aaron Patterson | 2014-05-09 | 1 | -8/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | do not test internals | |||||
* | | | | | Merge pull request #15041 from arthurnn/update_ruby | Guillermo Iguaran | 2014-05-09 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use ruby 2.1.2 on travis | |||||
| * | | | | | Use ruby 2.1.2 on travis | Arthur Neves | 2014-05-09 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | add tests for path based url_for calls | Aaron Patterson | 2014-05-08 | 1 | -2/+19 | |
| | | | | | ||||||
* | | | | | don't manipulate the testclass, just add helpers to the instance | Aaron Patterson | 2014-05-08 | 1 | -10/+11 | |
| | | | | | ||||||
* | | | | | add a test for classes with options | Aaron Patterson | 2014-05-08 | 1 | -0/+7 | |
| | | | | | ||||||
* | | | | | add tests for the polymorphic_path method | Aaron Patterson | 2014-05-08 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #15030 from mechanicles/a-to-an | Rafael Mendonça França | 2014-05-08 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Change 'a' to 'an' [ci skip] | |||||
| * | | | | | Change 'a' to 'an' [ci skip] | Santosh Wadghule | 2014-05-09 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #15029 from JuanitoFatas/docpatch/routing | Rafael Mendonça França | 2014-05-08 | 1 | -11/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip] Minor improvements on routing.md. | |||||
| * | | | | | [ci skip] Minor improvements on routing.md. | Juanito Fatas | 2014-05-09 | 1 | -11/+11 | |
| | | | | | | ||||||
* | | | | | | add more tests around the polymorphic url api | Aaron Patterson | 2014-05-08 | 1 | -0/+12 | |
| | | | | | | ||||||
* | | | | | | set a constant for the "anonymous" habtm model fixes #15022 | Aaron Patterson | 2014-05-08 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'( |