Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #29074 from kamipo/remove_returning_true_in_internal_callb... | Kasper Timm Hansen | 2017-05-28 | 3 | -13/+1 |
|\ | |||||
| * | Remove returning true in internal callbacks | Ryuta Kamizono | 2017-05-14 | 3 | -13/+1 |
* | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookies | Kasper Timm Hansen | 2017-05-28 | 10 | -108/+295 |
|\ \ | |||||
| * | | AEAD encrypted cookies and sessions | Michael Coyne | 2017-05-22 | 10 | -108/+295 |
* | | | Merge pull request #29253 from kamipo/prevent_extra_query | Matthew Draper | 2017-05-29 | 2 | -6/+12 |
|\ \ \ | |||||
| * | | | Prevent extra `current_database` query for `encoding`/`collation`/`ctype` | Ryuta Kamizono | 2017-05-28 | 2 | -6/+12 |
* | | | | Merge pull request #28969 from kamipo/refactor_enum_to_use_value_instead_of_l... | Matthew Draper | 2017-05-28 | 4 | -14/+16 |
|\ \ \ \ | |||||
| * | | | | Refactor enum to use `value` instead of `label` in the scope | Ryuta Kamizono | 2017-05-07 | 4 | -14/+16 |
* | | | | | Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitly | Matthew Draper | 2017-05-28 | 4 | -1/+13 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Delegate `ast` and `locked` to `arel` explicitly | Ryuta Kamizono | 2017-05-06 | 4 | -1/+13 |
* | | | | | Merge pull request #29097 from EilisHamilton/fix_uncountable_pluralization_lo... | Matthew Draper | 2017-05-28 | 3 | -6/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Fix pluralization of uncountables when given a locale | Eilis Hamilton | 2017-05-19 | 3 | -6/+20 |
* | | | | | | Merge pull request #29197 from kamipo/enable_extending_even_if_scope_returns_nil | Matthew Draper | 2017-05-28 | 2 | -7/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable extending even if scope returns nil | Ryuta Kamizono | 2017-05-24 | 2 | -7/+7 |
* | | | | | | | Merge pull request #29250 from kamipo/remove_unused_association_interpolate | Matthew Draper | 2017-05-28 | 1 | -8/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused `Association#interpolate` | Ryuta Kamizono | 2017-05-28 | 1 | -8/+0 |
* | | | | | | | | Merge pull request #29255 from y-yagi/bring_back_delayed_job_to_integration_test | Kasper Timm Hansen | 2017-05-28 | 2 | -6/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Bring back delayed_job to test list | yuuji.yaginuma | 2017-05-28 | 1 | -2/+1 |
| * | | | | | | | | Bump `delayed_job_active_record` gem | yuuji.yaginuma | 2017-05-28 | 1 | -4/+4 |
* | | | | | | | | | Clear all current instances before a reload. | Kasper Timm Hansen | 2017-05-28 | 2 | -2/+8 |
* | | | | | | | | | Make reset execution assertions easier to read. | Kasper Timm Hansen | 2017-05-28 | 1 | -15/+11 |
* | | | | | | | | | Remove double Thread.current storage. | Kasper Timm Hansen | 2017-05-28 | 1 | -5/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methods | Matthew Draper | 2017-05-28 | 2 | -0/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add lazy loading to #keys and #values methods in Session | codeforkjeff | 2017-04-26 | 2 | -0/+20 |
* | | | | | | | | | Merge pull request #29249 from bradleypriest/numericality-precision-regression | Matthew Draper | 2017-05-28 | 3 | -1/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix regression in Numericality validator where extra decimal places on | Bradley Priest | 2017-05-27 | 3 | -1/+22 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #29251 from y-yagi/fix_29247 | Matthew Draper | 2017-05-28 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Includes namespace in system test skelton when namespace is specified | yuuji.yaginuma | 2017-05-28 | 2 | -1/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | Use non-raising finder. | Kasper Timm Hansen | 2017-05-27 | 1 | -1/+1 |
* | | | | | | | | [ci skip] Fix spelling that's a bit of an overreach. | Kasper Timm Hansen | 2017-05-27 | 1 | -1/+1 |
* | | | | | | | | Use models to match the docs. | Kasper Timm Hansen | 2017-05-27 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #29246 from nihemak/fix-docs-take-first | Matthew Draper | 2017-05-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [ci skip]fix wrong variable name in docs | Makoto Nihei | 2017-05-27 | 1 | -3/+3 |
* | | | | | | | | | Merge pull request #29245 from nihemak/fix-docs-find | Richard Schneeman | 2017-05-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | [ci skip]fix wrong variable name in docs | Makoto Nihei | 2017-05-27 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Switch to rb-inotify master | Matthew Draper | 2017-05-27 | 2 | -7/+7 |
* | | | | | | | | Merge pull request #29240 from tjschuck/ar_batches_doc_updates | Rafael França | 2017-05-26 | 1 | -12/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Doc updates for ActiveRecord::Batches | T.J. Schuck | 2017-05-26 | 1 | -12/+12 |
* | | | | | | | | | Merge pull request #29242 from tjschuck/rdoc_formatting_fix | Rafael França | 2017-05-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix broken RDoc formatting | T.J. Schuck | 2017-05-26 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #29152 from djforth/master | Rafael Mendonça França | 2017-05-26 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update to rails-ujs documentation for yarn install | Adrian Stainforth | 2017-05-26 | 1 | -0/+10 |
* | | | | | | | | | | Merge pull request #29237 from mohitnatoo/arel-update-doc | Rafael França | 2017-05-26 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | [ci skip] Changed sentence formation for ActiveRecordRelation#update | Mohit Natoo | 2017-05-26 | 1 | -3/+3 |
* | | | | | | | | | | | Merge pull request #25037 from mohitnatoo/adapter-inquirer | Rafael França | 2017-05-26 | 2 | -3/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Removed string inquiry. | Mohit Natoo | 2017-05-26 | 2 | -6/+6 |
| * | | | | | | | | | | Provides friendlier way to access queue adapters of a job. | Mohit Natoo | 2017-05-26 | 2 | -4/+22 |
* | | | | | | | | | | | Merge pull request #29238 from ashishg-qburst/generator | Rafael França | 2017-05-26 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Do not show --webpack option in the plugin help message | ash | 2017-05-26 | 2 | -4/+5 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #29239 from koic/remove_redundant_test_assertion | Matthew Draper | 2017-05-27 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ |