Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into unlock-minitest | Rafael Mendonça França | 2017-08-01 | 2023 | -2034/+16833 |
|\ | |||||
| * | Merge pull request #30015 from larskanis/use-duktake-on-mingw | Guillermo Iguaran | 2017-08-01 | 2 | -0/+4 |
| |\ | |||||
| | * | Use duktape gem as default JS engine on Windows-MINGW and MS-Visual-C builds | Lars Kanis | 2017-08-01 | 2 | -0/+4 |
| * | | Update working_with_javascript_in_rails.md | Guillermo Iguaran | 2017-08-01 | 1 | -1/+1 |
| * | | Clarify route encoding test | eileencodes | 2017-08-01 | 1 | -6/+12 |
| * | | Merge pull request #30023 from y-yagi/remove_unnecessary_doc_directory_deletion | Guillermo Iguaran | 2017-08-01 | 2 | -2/+0 |
| |\ \ | |||||
| | * | | Remove unnecessary `doc` directory deletion | yuuji.yaginuma | 2017-08-01 | 2 | -2/+0 |
| * | | | Update working_with_javascript_in_rails.md | Guillermo Iguaran | 2017-08-01 | 1 | -1/+1 |
| * | | | Path parameters should default to UTF8 | eileencodes | 2017-08-01 | 5 | -14/+44 |
| * | | | Merge pull request #30029 from yhirano55/fix_rails_command_comments | Sean Griffin | 2017-08-01 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | [ci skip] Fix rails_command comments | Yoshiyuki Hirano | 2017-08-01 | 1 | -3/+3 |
| * | | | | Merge pull request #30021 from roberts1000/fix-rubocop-issues | Rafael França | 2017-08-01 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Fix rubocop style issues in yarn and spring.rb templates" | roberts1000 | 2017-07-31 | 2 | -3/+3 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #30024 from kamipo/remove_redundant_unless_branch | Sean Griffin | 2017-07-31 | 1 | -2/+0 |
| |\ \ \ \ | |||||
| | * | | | | Remove redundant `unless current_adapter?(:OracleAdapter)` | Ryuta Kamizono | 2017-07-28 | 1 | -2/+0 |
| * | | | | | Talk about bytes not characters | Rafael Mendonça França | 2017-07-31 | 1 | -3/+3 |
| * | | | | | Add backticks around method [ci skip] | Ryuta Kamizono | 2017-08-01 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #30017 from bslobodin/fix-typo-in-assert-changes | Rafael França | 2017-07-31 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | fix typo in assert_changes error message | Boris Slobodin | 2017-07-31 | 1 | -1/+1 |
| * | | | | | Merge pull request #30016 from albertoalmagro/set-ruby-version-in-gemfile-and... | Guillermo Iguaran | 2017-07-31 | 5 | -0/+25 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Set Ruby version in Gemfile and .ruby-version by default | Alberto Almagro | 2017-07-31 | 5 | -0/+25 |
| |/ / / / | |||||
| * | | | | Merge pull request #29950 from MaxLap/avoid_or_clause_duplicates | Sean Griffin | 2017-07-31 | 3 | -6/+66 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Edits following the reviews | Maxime Lapointe | 2017-07-28 | 2 | -27/+43 |
| | * | | | Avoid duplicate clauses when using #or | Maxime Lapointe | 2017-07-25 | 3 | -9/+53 |
| * | | | | Merge pull request #30001 from y-yagi/fix_test_directory | Kasper Timm Hansen | 2017-07-30 | 3 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Fix test directory to correct path | yuuji.yaginuma | 2017-07-30 | 3 | -3/+3 |
| * | | | | | Merge pull request #29951 from georgeclaghorn/action-view-test-flow | Kasper Timm Hansen | 2017-07-30 | 2 | -0/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix testing helpers that use Action View's capturing helpers (e.g. content_for) | George Claghorn | 2017-07-25 | 2 | -0/+10 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Fix github user output. | Kasper Timm Hansen | 2017-07-30 | 1 | -1/+1 |
| * | | | | | Merge pull request #29963 from y-yagi/fix_ruby_warnings | Kasper Timm Hansen | 2017-07-30 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix `warning: method redefined;` | yuuji.yaginuma | 2017-07-28 | 1 | -3/+3 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #30002 from y-yagi/change_http_postgresql_links_to_https | Vipul A M | 2017-07-30 | 8 | -32/+32 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Change http postgresql.org links to https [ci skip] | yuuji.yaginuma | 2017-07-30 | 8 | -32/+32 |
| |/ / / / | |||||
| * | | | | Merge pull request #29933 from kirs/frozen-actionpack | Matthew Draper | 2017-07-29 | 281 | -3/+563 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Use frozen string literal in actionpack/ | Kir Shatrov | 2017-07-29 | 281 | -3/+563 |
| |/ / / | |||||
| * | | | Merge pull request #29946 from kamipo/passing_arel_to_where_is_boundable | Sean Griffin | 2017-07-28 | 1 | -4/+1 |
| |\ \ \ | |||||
| | * | | | Building `where_clause` in `UniquenessValidator` is no longer needed | Ryuta Kamizono | 2017-07-26 | 1 | -4/+1 |
| * | | | | Merge pull request #29979 from kamipo/use_build_bind_attribute | Sean Griffin | 2017-07-28 | 4 | -8/+7 |
| |\ \ \ \ | |||||
| | * | | | | Use `predicate_builder.build_bind_attribute` wherever possible | Ryuta Kamizono | 2017-07-28 | 4 | -8/+7 |
| | | |_|/ | | |/| | | |||||
| * | | | | Add missing support for modulo operations on durations | Sayan Chakraborty | 2017-07-28 | 3 | -14/+131 |
| * | | | | Merge pull request #29982 from ydakuka/patch-1 | Robin Dupret | 2017-07-28 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Squashed commit of the following: | ydakuka | 2017-07-28 | 1 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #29980 from ydakuka/patch-1 | Robin Dupret | 2017-07-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | [ci skip] update routing guide | Yauheni Dakuka | 2017-07-28 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Eager load the association classes on boot | Rafael Mendonça França | 2017-07-27 | 1 | -7/+7 |
| * | | | Merge pull request #29971 from rails/fix-duration-division | Andrew White | 2017-07-27 | 3 | -15/+28 |
| |\ \ \ | |||||
| | * | | | Fix division where a duration is the denominator | Andrew White | 2017-07-27 | 3 | -15/+28 |
| * | | | | Merge pull request #28695 from koic/integer_type_has_precision_option_in_oracle | Akira Matsuda | 2017-07-27 | 1 | -1/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix an AR test of schema dump when using Oracle | Koichi ITO | 2017-04-07 | 1 | -1/+5 |
| * | | | | Merge pull request #29959 from kaanklky/master | Rafael França | 2017-07-26 | 1 | -0/+4 |
| |\ \ \ \ |