Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #27392 from y-yagi/use_same_class_on_compact | Sean Griffin | 2017-01-06 | 2 | -0/+14 | |
|\ \ \ | ||||||
| * | | | ensure `#compact` of HWIDA to return HWIDA | yuuji.yaginuma | 2017-01-06 | 2 | -0/+14 | |
* | | | | Merge pull request #27227 from MQuy/allow-custom-content-type-in-mail-body | Rafael Mendonça França | 2017-01-06 | 3 | -4/+38 | |
|\ \ \ \ | ||||||
| * | | | | Remove unnecessary condition in content_type | MQuy | 2017-01-06 | 1 | -1/+1 | |
| * | | | | Add document in mailer | MQuy | 2016-12-06 | 1 | -0/+13 | |
| * | | | | Fix wrong typo in test | MQuy | 2016-12-05 | 1 | -1/+1 | |
| * | | | | Add changelog for custom content type | MQuy | 2016-12-01 | 2 | -0/+16 | |
| * | | | | allow context type when set body mail | MQuy | 2016-11-30 | 2 | -4/+13 | |
* | | | | | Remove unneeded Deprecation silence | Rafael Mendonça França | 2017-01-06 | 1 | -5/+3 | |
* | | | | | Merge pull request #27294 from eavgerinos/doc-ar-callbacks-order | Rafael França | 2017-01-06 | 1 | -0/+49 | |
|\ \ \ \ \ | ||||||
| * | | | | | [ci skip] ActiveRecord: Document order of Callbacks | Aggelos Avgerinos | 2016-12-22 | 1 | -0/+49 | |
* | | | | | | Merge pull request #27586 from maclover7/jm-fix-27584 | Rafael França | 2017-01-06 | 2 | -3/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update `cookies` helper on all HTTP requests | Jon Moss | 2017-01-05 | 2 | -3/+11 | |
|/ / / / / / | ||||||
* | | | | | | Privatize unneededly protected methods in Active Record | Akira Matsuda | 2017-01-05 | 5 | -16/+12 | |
* | | | | | | `self.` is not needed when calling its own instance method | Akira Matsuda | 2017-01-05 | 60 | -71/+71 | |
* | | | | | | CI against jruby-9.1.6.0 | Akira Matsuda | 2017-01-05 | 1 | -3/+3 | |
* | | | | | | This method is never called since 8e633e505880755e7e366ccec2210bbe2b5436e7 | Akira Matsuda | 2017-01-05 | 1 | -7/+0 | |
* | | | | | | bundle u sqlite3 | Akira Matsuda | 2017-01-05 | 1 | -3/+3 | |
* | | | | | | Merge pull request #27580 from kamipo/optimize_information_schema_query | Rafael França | 2017-01-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Optimizing information_schema query for `foreign_keys` | Ryuta Kamizono | 2017-01-05 | 1 | -0/+1 | |
* | | | | | | | Fix style guide violations | Rafael Mendonça França | 2017-01-05 | 5 | -9/+8 | |
|/ / / / / / | ||||||
* | | | | | | Make sure we generate keys that can be used with the cipher | Rafael Mendonça França | 2017-01-04 | 1 | -4/+4 | |
* | | | | | | Merge pull request #26480 from tbrisker/fix-26461 | Rafael França | 2017-01-04 | 1 | -2/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Reword according to feedback | Tomer Brisker | 2016-09-15 | 1 | -8/+7 | |
| * | | | | | | Clarify that mattr_* creates public methods | Tomer Brisker | 2016-09-13 | 1 | -0/+6 | |
* | | | | | | | Merge pull request #27549 from mpugach/consider_params_in_current_page | Rafael França | 2017-01-04 | 3 | -2/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add `check_parameters` option to `current_page?` | Maksym Pugach | 2017-01-04 | 3 | -2/+20 | |
* | | | | | | | | Merge pull request #27578 from kenta-s/fix-typo-in-asset_pipeline_md | Jon Moss | 2017-01-04 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix typo in asset_pipeline.md [ci skip] | kenta-s | 2017-01-05 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #27575 from yahonda/diag_like_26370 | Rafael França | 2017-01-04 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Require "models/post" before "models/comment" | Yasuo Honda | 2017-01-04 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #27446 from zachahn/asset-hash-md5-to-sha256 | Rafael França | 2017-01-04 | 1 | -22/+24 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update asset fingerprinting information | Zach Ahn | 2016-12-23 | 1 | -22/+24 | |
* | | | | | | | | String#end_with? should be faster than Regexp here | Akira Matsuda | 2017-01-05 | 1 | -1/+1 | |
* | | | | | | | | There's no such module | Akira Matsuda | 2017-01-05 | 2 | -8/+8 | |
* | | | | | | | | No need to :doc: a public method | Akira Matsuda | 2017-01-05 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #27485 from cih/hmt-warning | Andrew White | 2017-01-04 | 5 | -0/+38 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Raise error when has_many through is defined before through association | Chris Holmes | 2017-01-04 | 5 | -0/+38 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #27552 from jarijokinen/fix-default-locale-code-example | Andrew White | 2017-01-04 | 1 | -5/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add instructions for available_locales [skip ci] | Jari Jokinen | 2017-01-04 | 1 | -5/+10 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-vars | Rafael Mendonça França | 2017-01-03 | 3 | -1/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Rails.env falls back to dev mode when env var is empty | Daniel Deng | 2017-01-04 | 3 | -1/+18 | |
* | | | | | | | | | Merge pull request #27564 from kamipo/fix_find_by_active_record_base_object-2 | Rafael França | 2017-01-03 | 2 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix `find_by` and `where` consistency | Ryuta Kamizono | 2017-01-04 | 2 | -3/+8 | |
* | | | | | | | | | | Fix configuration test now that Metal#env was removed | Rafael Mendonça França | 2017-01-03 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Revert "Merge pull request #21233 from mtsmfm/disable-referential-integrity-w... | Rafael Mendonça França | 2017-01-03 | 25 | -207/+114 | |
* | | | | | | | | | Revert "Merge pull request #27550 from mtsmfm/fix-generator-command-for-neste... | Rafael Mendonça França | 2017-01-03 | 9 | -29/+9 | |
* | | | | | | | | | Merge pull request #27550 from mtsmfm/fix-generator-command-for-nested-rails-... | Rafael França | 2017-01-03 | 9 | -9/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix generator command for nested (namespaced) rails engine | Fumiaki MATSUSHIMA | 2017-01-03 | 9 | -9/+29 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #27562 from maclover7/jm-as-rm-require | Rafael Mendonça França | 2017-01-03 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ \ |