aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #29313 from Shopify/bootsnapRafael França2017-07-175-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add bootsnap to default Gemfile:Burke Libbey2017-07-175-0/+15
* | | | | | | | | | | | Merge pull request #29788 from kamipo/remove_unused_mutex_mRafael França2017-07-174-11/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make `generated_attribute_methods` to privateRyuta Kamizono2017-07-143-6/+6
| * | | | | | | | | | | | Remove unused `Mutex_m` in Active ModelRyuta Kamizono2017-07-142-6/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29793 from arthurnn/arthurnn/param_encoding_error_msgRafael França2017-07-172-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Scrub the invalid paramter value before using it in the errorArthur Neves2017-07-172-2/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #27662 from nhorton/patch-1Sean Griffin2017-07-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixing "Adding Member Routes" documentationNoah Horton2017-01-121-1/+1
* | | | | | | | | | | | Allow multiparameter assigned attributes to be used with `text_field`Sean Griffin2017-07-175-1/+25
* | | | | | | | | | | | Merge pull request #29758 from glaucocustodio/patch-1 [ci skip]Sean Griffin2017-07-172-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add documentation for class_attribute optionsGlauco Custódio2017-07-172-2/+11
* | | | | | | | | | | | | Merge pull request #29825 from kamipo/remove_useless_arel_engineSean Griffin2017-07-174-19/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove useless `arel_engine`Ryuta Kamizono2017-07-174-19/+3
* | | | | | | | | | | | | | Post.joins(:users) should not be affected by `User.current_scope`Sean Griffin2017-07-173-4/+19
* | | | | | | | | | | | | | Merge pull request #28077 from Erol/make-reverse-merge-bang-order-consistentSean Griffin2017-07-174-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into make-reverse-merge-bang-order-consistentSean Griffin2017-07-171531-11616/+18098
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #29810 from kamipo/add_first_parameter_indentationMatthew Draper2017-07-176-30/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Enable `Layout/FirstParameterIndentation` copRyuta Kamizono2017-07-176-30/+34
* | | | | | | | | | | | | | | Merge pull request #29821 from y-yagi/set_rails_env_before_load_application_fileKasper Timm Hansen2017-07-172-4/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Set `RAILS_ENV` before load application fileyuuji.yaginuma2017-07-172-4/+36
* | | | | | | | | | | | | | | Merge pull request #29819 from kirs/frozen-activemodelMatthew Draper2017-07-17117-0/+232
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use frozen string literal in activemodel/Kir Shatrov2017-07-16117-0/+232
* | | | | | | | | | | | | | | Merge pull request #29812 from kamipo/remove_unused_requiresKasper Timm Hansen2017-07-162-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove unused requiresRyuta Kamizono2017-07-162-5/+0
* | | | | | | | | | | | | | | | Merge pull request #29782 from y-yagi/follow_up_29699Kasper Timm Hansen2017-07-165-17/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add helper method for explicit lazy loadyuuji.yaginuma2017-07-161-13/+18
| * | | | | | | | | | | | | | | | Set `represent_boolean_as_integer` via `configuration`yuuji.yaginuma2017-07-165-5/+33
* | | | | | | | | | | | | | | | | Merge pull request #29813 from kamipo/fix_create_with_multiparameter_attributesKasper Timm Hansen2017-07-162-16/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix `create_with` with multiparameter attributesRyuta Kamizono2017-07-162-16/+34
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #29814 from kamipo/dont_cache_scope_for_createKasper Timm Hansen2017-07-164-14/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Don't cache `scope_for_create`Ryuta Kamizono2017-07-164-14/+6
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #29358 from robin850/dbconsole-connectionKasper Timm Hansen2017-07-166-19/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Properly expand the environment's nameRobin Dupret2017-07-166-7/+22
| * | | | | | | | | | | | | | | | | Deprecate environment as an argument for dbconsole and consoleRobin Dupret2017-07-164-12/+44
| * | | | | | | | | | | | | | | | | Allow to pass a connection to the `dbconsole` commandRobin Dupret2017-07-163-2/+64
| |/ / / / / / / / / / / / / / / /
* | | / / / / / / / / / / / / / / Fix root not being defined on Travis.Kasper Timm Hansen2017-07-161-1/+6
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | explain why require_relative is not used here [ci skip]Xavier Noria2017-07-161-0/+2
* | | | | | | | | | | | | | | | Fix code formatting for QueryMethods#selectRobin Dupret2017-07-161-2/+3
* | | | | | | | | | | | | | | | Merge pull request #29817 from koic/replace_erubis_with_erubi_in_guideRyuta Kamizono2017-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Replace Erubis with Erubi in a part of guide [ci skip]Koichi ITO2017-07-161-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #29809 from kamipo/remove_unused_ivarsKasper Timm Hansen2017-07-161-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove unused `@last`, `@order_clause`, and `@join_dependency`Ryuta Kamizono2017-07-161-2/+1
* | | | | | | | | | | | | | | Merge pull request #29771 from kamipo/fix_create_with_using_both_string_and_s...Kasper Timm Hansen2017-07-169-22/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix `create_with` using both string and symbolRyuta Kamizono2017-07-169-18/+20
| * | | | | | | | | | | | | | Use `where(id: 10)` rather than `where(relation.table[:id].eq(10))`Ryuta Kamizono2017-07-161-5/+5
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #29645 from y-yagi/check_component_when_run_app_updateKasper Timm Hansen2017-07-165-23/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Do not generate unused components contents in `app:update` taskyuuji.yaginuma2017-07-165-23/+60
* | | | | | | | | | | | | | | Merge pull request #29806 from yhirano55/remove_blank_line_in_setupKasper Timm Hansen2017-07-161-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove blank lines in setupYoshiyuki Hirano2017-07-161-2/+3
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |