aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20366 from Gaurav2728/gaurav-mailerMatthew Draper2015-05-301-1/+0
|\ | | | | not require mail file
| * not require mail fileGaurav Sharma2015-05-291-1/+0
|/ | | | | | ``` it added in this commit (https://github.com/rails/rails/commit/2a25c4ce6da6ea23ebdf44e7eb2d2441dbea20a1), now no warnings occur. ```
* Merge pull request #20364 from ernie/update-serialize-docsSean Griffin2015-05-291-0/+9
|\ | | | | | | | | | | Update docs for ActiveRecord `serialize` [ci skip]
| * Update docs for ActiveRecord `serialize`Ernie Miller2015-05-291-0/+9
|/ | | | | | | | | | | | For certain column types, using `serialize` is unnecessary, or the user may get unexpected contents back from the DB adapter (which is handling some basic deserialization for them). Call this out in the documentation. For background, see: https://gist.github.com/ernie/33f75f2294885b9806f9 https://twitter.com/erniemiller/status/604262907442905090
* Merge pull request #20355 from segiddins/seg-bundler-1-10Santiago Pastorino2015-05-292-2/+4
|\ | | | | Bundler 1.10 should work now!
| * Generate Bundler 1.10.1 lockfileSamuel E. Giddins2015-05-281-0/+3
| |
| * Revert "Use bundler < 1.10 until its bugs are fixed"Samuel E. Giddins2015-05-281-1/+1
| | | | | | | | This reverts commit 81b42970f02d07ca5007bbce920b489d80172636.
| * Revert "Uninstall bundler 1.10"Samuel E. Giddins2015-05-281-1/+0
| | | | | | | | This reverts commit 410d246bc0ddabe47f0bf54116be9087bd3d4bda.
| * Revert "Force the uninstall"Samuel E. Giddins2015-05-281-1/+1
| | | | | | | | This reverts commit 9ff901bd3e046b0373b28459269146707b5bf8c9.
* | Merge pull request #20358 from tgxworld/remove_codeSantiago Pastorino2015-05-291-2/+0
|\ \ | | | | | | Remove unused code.
| * | Remove unused code.Guo Xiang Tan2015-05-291-2/+0
| |/ | | | | | | Code was moved into the `assign` method.
* | Merge pull request #20354 from arunagw/fix-warning-ambiguous-first-argumentYves Senn2015-05-291-1/+1
|\ \ | |/ |/| Fix warning about ambiguous first argument
| * Fix warning about ambiguous first argumentArun Agrawal2015-05-291-1/+1
|/
* Merge pull request #19878 from pabloh/replace_alias_chains_with_prependRafael Mendonça França2015-05-285-89/+79
|\ | | | | Replace use of alias chains with prepend at core_ext/date and core_ext/time
| * Replace use of alias chains with prepend at core_ext/datePablo Herrero2015-05-045-89/+79
| |
* | Force the uninstallRafael Mendonça França2015-05-281-1/+1
| |
* | Uninstall bundler 1.10Rafael Mendonça França2015-05-281-0/+1
| |
* | Use bundler < 1.10 until its bugs are fixedRafael Mendonça França2015-05-281-1/+1
| | | | | | | | See https://github.com/bundler/bundler/issues/3681
* | Merge pull request #20351 from kddeisz/enumerable_pluckRafael Mendonça França2015-05-281-0/+10
|\ \ | | | | | | Updating the guides for Enumerable#pluck
| * | Updating the guides for Enumerable#pluckKevin Deisz2015-05-281-0/+10
|/ /
* | Merge pull request #20341 from ↵Rafael Mendonça França2015-05-281-36/+0
|\ \ | | | | | | | | | | | | vngrs/remove_already_defined_methods_in_rack_request Remove already defined methods in super class of ActionDispatch::Request class
| * | Remove already defined methods in super class of ActionDispatch::Request classMehmet Emin İNAÇ2015-05-281-36/+0
| | | | | | | | | | | | | | | | | | | | | These methods had defined in 2004 by dhh in initial commit and `ActionDispatch::Request` class has been inherited from `Rack::Request` class in 2009 by josh. In 2014 these methods and more of them defined in `Rack::Request` class so we don't need them anymore in rails codebase.
* | | Merge pull request #20346 from repinel/remove-mocha2Rafael Mendonça França2015-05-284-59/+117
|\ \ \ | | | | | | | | Remove use of mocha from Active Model
| * | | Remove use of mocha from Active ModelRoque Pinel2015-05-284-59/+117
| | | |
* | | | Merge pull request #20267 from kaspth/fix-minitest-constant-clashingRafael Mendonça França2015-05-288-43/+45
|\ \ \ \ | | | | | | | | | | Avoid E constant clashing with Minitest defined version.
| * | | | Avoid E constant clashing with Minitest defined version.Kasper Timm Hansen2015-05-228-43/+45
| | | | | | | | | | | | | | | | | | | | | | | | | Minitest sets an E constant to an empty string to save GC time. This clashes with autoloading tests which define an E constant.
* | | | | Merge pull request #20350 from kddeisz/enumerable_pluckRafael Mendonça França2015-05-283-0/+20
|\ \ \ \ \ | | | | | | | | | | | | Add Enumerable#pluck.
| * | | | | Add Enumerable#pluck.Kevin Deisz2015-05-283-0/+20
| | |/ / / | |/| | | | | | | | | | | | | Allows fetching the same values from arrays as from ActiveRecord associations.
* | | | | Merge pull request #20347 from repinel/fix-reflection-shadowingRafael Mendonça França2015-05-281-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix the shadowing warning for `reflection`
| * | | | Fix the shadowing warning for `reflection`Roque Pinel2015-05-281-2/+2
|/ / / /
* | | | Persist user provided default values, even if unchangedSean Griffin2015-05-284-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a usability change to fix a quirk from our definition of partial writes. By default, we only persist changed attributes. When creating a new record, this is assumed that the default values came from the database. However, if the user provided a default, it will not be persisted, since we didn't see it as "changed". Since this is a very specific case, I wanted to isolate it with the other quirks that come from user provided default values. The number of edge cases which are presenting themselves are starting to make me wonder if we should just remove the ability to assign a default, in favor of overriding `initialize`. For the time being, this is required for the attributes API to not have confusing behavior. We had to delete one test, since this actually changes the meaning of `.changed?` on Active Record models. It now specifically means `changed_from_database?`. While I think this will make the attributes API more ergonomic to use, it is a subtle change in definition (though not a backwards incompatible one). We should probably figure out the right place to document this. (Feel free to open a PR doing that if you're reading this). /cc @rafaelfranca @kirs @senny This is an alternate implementation of #19921. Close #19921. [Sean Griffin & Kir Shatrov]
* | | | Allow proc defaults with the Attributes APISean Griffin2015-05-283-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a variant implementation of the changes proposed in #19914. Unlike that PR, the change in behavior is isolated in its own class. This is to prevent wonky behavior if a Proc is assigned outside of the default, and it is a natural place to place the behavior required by #19921 as well. Close #19914. [Sean Griffin & Kir Shatrov]
* | | | Merge pull request #20017 from eliotsykes/configurable-static-index-filenameRafael Mendonça França2015-05-2812-8/+65
|\ \ \ \ | | | | | | | | | | | | | | | config.static_index configures directory Index "index.html" filename
| * | | | config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-2812-8/+65
| | |/ / | |/| | | | | | | | | | | | | | | | | | Set `config.static_index` to serve a static directory index file not named `index`. For example, to serve `main.html` instead of `index.html` for directory requests, set `config.static_index` to `"main"`.
* | | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-288-62/+2
|\ \ \ \ | | | | | | | | | | Remove unused package tasks
| * | | | Remove unused package tasksArun Agrawal2015-05-288-62/+2
| |/ / / | | | | | | | | | | | | We are using `all:build` now.
* | | | Merge pull request #20344 from jcockhren/fix_docs_presence_validationLauro Caetano2015-05-281-1/+0
|\ \ \ \ | | | | | | | | | | removed erroneous line. Corrected presence validation example.
| * | | | removed erroneous line. Corrected presence validation example.Jurnell Cockhren2015-05-281-1/+0
|/ / / / | | | | | | | | | | | | | | | | Addresses #20343. Removes erroneous line of code in the sample codeblock.
* | | | Merge pull request #20313 from s3ymd/masterArthur Nogueira Neves2015-05-281-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix block parameter of assert_no_difference
| * | | | [ci skip] Fix block parameter of assert_no_differenceHiromichi Yamada2015-05-281-1/+1
| | | | |
* | | | | Merge pull request #20336 from vngrs/deprecate_nothing_option_for_render_methodSantiago Pastorino2015-05-2813-49/+38
|\ \ \ \ \ | |/ / / / |/| | | | Deprecate `:nothing` option for render method
| * | | | Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-2813-49/+38
| |/ / / | | | | | | | | | | | | `head` method works similar to `render` method with `:nothing` option
* | | | Merge pull request #20332 from henders/shender/changelog_reload_creditArun Agrawal2015-05-281-2/+2
|\ \ \ \ | |/ / / |/| | | Give credit to extra contributor for Base.reload fix
| * | | Give credit to extra contributor for Base.reload fixShane Hender2015-05-281-2/+2
|/ / /
* | | Merge pull request #20196 from huoxito/preload-association-and-mergesRafael Mendonça França2015-05-282-2/+50
|\ \ \ | | | | | | | | Properly append preload / includes args on Merger
| * | | Properly append preload / includes args on MergerWashington Luiz2015-05-282-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Couldn't find other way to get the association name from a given class other than looping through `reflect_on_all_associations` reflections .. Noticed this one while looking at this example: ```ruby class Product < ActiveRecord::Base has_many :variants has_many :translations end class Translation < ActiveRecord::Base belongs_to :product end class Variant < ActiveRecord::Base belongs_to :product end class BugTest < Minitest::Test def test_merge_stuff product = Product.create! name: 'huhu' variant = Variant.create! product_id: product.id Translation.create! locale: 'en', product_id: product.id product_relation = Product.all .preload(:translations) .joins(:translations) .merge(Translation.where(locale: 'en')) .where(name: 'huhu') assert_equal variant, Variant.joins(:product).merge(product_relation).first end end ```
* | | | Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionviewRafael Mendonça França2015-05-281-21/+3
|\ \ \ \ | | | | | | | | | | Remove custom `lines` and use `/tools/line_statistics`
| * | | | Remove custom `lines` and use `/tools/line_statistics`Arun Agrawal2015-05-221-21/+3
| | | | |
* | | | | Merge pull request #20041 from akshay-vishnoi/sqlite_collationRafael Mendonça França2015-05-286-9/+139
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | SQLite3: Add collation support for string and text columns
| * | | | | Add collation support for string and text columns in SQLite3Akshay Vishnoi2015-05-286-9/+139
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 12:28:58 +0000