aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-012023-2034/+16833
|\
| * Merge pull request #30015 from larskanis/use-duktake-on-mingwGuillermo Iguaran2017-08-012-0/+4
| |\
| | * Use duktape gem as default JS engine on Windows-MINGW and MS-Visual-C buildsLars Kanis2017-08-012-0/+4
| * | Update working_with_javascript_in_rails.mdGuillermo Iguaran2017-08-011-1/+1
| * | Clarify route encoding testeileencodes2017-08-011-6/+12
| * | Merge pull request #30023 from y-yagi/remove_unnecessary_doc_directory_deletionGuillermo Iguaran2017-08-012-2/+0
| |\ \
| | * | Remove unnecessary `doc` directory deletionyuuji.yaginuma2017-08-012-2/+0
| * | | Update working_with_javascript_in_rails.mdGuillermo Iguaran2017-08-011-1/+1
| * | | Path parameters should default to UTF8eileencodes2017-08-015-14/+44
| * | | Merge pull request #30029 from yhirano55/fix_rails_command_commentsSean Griffin2017-08-011-3/+3
| |\ \ \
| | * | | [ci skip] Fix rails_command commentsYoshiyuki Hirano2017-08-011-3/+3
| * | | | Merge pull request #30021 from roberts1000/fix-rubocop-issuesRafael França2017-08-012-3/+3
| |\ \ \ \
| | * | | | Fix rubocop style issues in yarn and spring.rb templates"roberts10002017-07-312-3/+3
| | | |/ / | | |/| |
| * | | | Merge pull request #30024 from kamipo/remove_redundant_unless_branchSean Griffin2017-07-311-2/+0
| |\ \ \ \
| | * | | | Remove redundant `unless current_adapter?(:OracleAdapter)`Ryuta Kamizono2017-07-281-2/+0
| * | | | | Talk about bytes not charactersRafael Mendonça França2017-07-311-3/+3
| * | | | | Add backticks around method [ci skip]Ryuta Kamizono2017-08-011-1/+1
| | |/ / / | |/| | |
| * | | | Merge pull request #30017 from bslobodin/fix-typo-in-assert-changesRafael França2017-07-311-1/+1
| |\ \ \ \
| | * | | | fix typo in assert_changes error messageBoris Slobodin2017-07-311-1/+1
| * | | | | Merge pull request #30016 from albertoalmagro/set-ruby-version-in-gemfile-and...Guillermo Iguaran2017-07-315-0/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Set Ruby version in Gemfile and .ruby-version by defaultAlberto Almagro2017-07-315-0/+25
| |/ / / /
| * | | | Merge pull request #29950 from MaxLap/avoid_or_clause_duplicatesSean Griffin2017-07-313-6/+66
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Edits following the reviewsMaxime Lapointe2017-07-282-27/+43
| | * | | Avoid duplicate clauses when using #orMaxime Lapointe2017-07-253-9/+53
| * | | | Merge pull request #30001 from y-yagi/fix_test_directoryKasper Timm Hansen2017-07-303-3/+3
| |\ \ \ \
| | * | | | Fix test directory to correct pathyuuji.yaginuma2017-07-303-3/+3
| * | | | | Merge pull request #29951 from georgeclaghorn/action-view-test-flowKasper Timm Hansen2017-07-302-0/+10
| |\ \ \ \ \
| | * | | | | Fix testing helpers that use Action View's capturing helpers (e.g. content_for)George Claghorn2017-07-252-0/+10
| | | |/ / / | | |/| | |
| * | | | | Fix github user output.Kasper Timm Hansen2017-07-301-1/+1
| * | | | | Merge pull request #29963 from y-yagi/fix_ruby_warningsKasper Timm Hansen2017-07-301-3/+3
| |\ \ \ \ \
| | * | | | | Fix `warning: method redefined;`yuuji.yaginuma2017-07-281-3/+3
| | |/ / / /
| * | | | | Merge pull request #30002 from y-yagi/change_http_postgresql_links_to_httpsVipul A M2017-07-308-32/+32
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Change http postgresql.org links to https [ci skip]yuuji.yaginuma2017-07-308-32/+32
| |/ / / /
| * | | | Merge pull request #29933 from kirs/frozen-actionpackMatthew Draper2017-07-29281-3/+563
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use frozen string literal in actionpack/Kir Shatrov2017-07-29281-3/+563
| |/ / /
| * | | Merge pull request #29946 from kamipo/passing_arel_to_where_is_boundableSean Griffin2017-07-281-4/+1
| |\ \ \
| | * | | Building `where_clause` in `UniquenessValidator` is no longer neededRyuta Kamizono2017-07-261-4/+1
| * | | | Merge pull request #29979 from kamipo/use_build_bind_attributeSean Griffin2017-07-284-8/+7
| |\ \ \ \
| | * | | | Use `predicate_builder.build_bind_attribute` wherever possibleRyuta Kamizono2017-07-284-8/+7
| | | |_|/ | | |/| |
| * | | | Add missing support for modulo operations on durationsSayan Chakraborty2017-07-283-14/+131
| * | | | Merge pull request #29982 from ydakuka/patch-1Robin Dupret2017-07-281-3/+3
| |\ \ \ \
| | * | | | Squashed commit of the following:ydakuka2017-07-281-3/+3
| |/ / / /
| * | | | Merge pull request #29980 from ydakuka/patch-1Robin Dupret2017-07-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ci skip] update routing guideYauheni Dakuka2017-07-281-1/+1
| |/ / /
| * | | Eager load the association classes on bootRafael Mendonça França2017-07-271-7/+7
| * | | Merge pull request #29971 from rails/fix-duration-divisionAndrew White2017-07-273-15/+28
| |\ \ \
| | * | | Fix division where a duration is the denominatorAndrew White2017-07-273-15/+28
| * | | | Merge pull request #28695 from koic/integer_type_has_precision_option_in_oracleAkira Matsuda2017-07-271-1/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix an AR test of schema dump when using OracleKoichi ITO2017-04-071-1/+5
| * | | | Merge pull request #29959 from kaanklky/masterRafael França2017-07-261-0/+4
| |\ \ \ \