aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24128 from y-yagi/add_return_values_to_exampleRafael França2016-03-091-1/+1
|\ | | | | add return values to example [ci skip]
| * add return values to example [ci skip]yuuji.yaginuma2016-03-101-1/+1
|/
* Revert "Merge pull request #24125 from dharamgollapudi/patch-3"Matthew Draper2016-03-101-0/+0
| | | | | This reverts commit b3c487515c11c367855eda7742bda4a3d680b740, reversing changes made to 4b43651884309c0f5be4dbdd11ea4d16fb880c30.
* Merge pull request #24125 from dharamgollapudi/patch-3Rafael França2016-03-091-0/+0
|\ | | | | Rename dependencies.rake to cache_digests.rake
| * Rename dependencies.rake to cache_digests.rakeDharam Gollapudi2016-03-091-0/+0
|/ | | | | | As the tasks are related to cache_digests and as they are already namespaced under cache_digests, renaming to cache_digests.rake makes it to know where to find these tasks.
* Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchersRafael França2016-03-092-14/+15
|\ | | | | Remove passing `with_dispatchers` to AppGenerator
| * Remove passing `with_dispatchers` to AppGeneratorPrathamesh Sonpatki2016-03-092-14/+15
| | | | | | | | | | | | | | - While working on https://github.com/rails/rails/pull/22790 I found out that we pass `with_dispatchers: true` but it's not used at all by Rails. - We were passing `with_dispatchers: true` in few tests too but again it's not used by Rails.
* | Merge pull request #24123 from mperham/masterRafael França2016-03-092-6/+21
|\ \ | | | | | | Job payload should be symmetric across JSON dump/load
| * | Add JSON round trip verification testcaseMike Perham2016-03-092-2/+17
| | |
| * | Job payload should be symmetric across JSON dump/loadMike Perham2016-03-092-4/+4
| | | | | | | | | Placing non-native JSON data types, like symbols, in the hash to serialize means that the deserialize method will return something different from what was serialized, a common bug and source of frustration for devs.
* | | Merge pull request #24121 from y-yagi/use_same_to_type_objectRafael França2016-03-092-2/+2
|\ \ \ | |/ / |/| | use same name to type object
| * | use same name to type objectyuuji.yaginuma2016-03-092-2/+2
| | | | | | | | | | | | Follow up to #24079
* | | Add `ActionController::Parameters#dig`Sean Griffin2016-03-093-0/+40
| | | | | | | | | | | | | | | | | | This method will only be added when used with Ruby 2.3.0 or greater. This method has the same behavior as `Hash#dig`, except it will convert hashes to `ActionController::Parameters`, similar to `#[]` and `#fetch`.
* | | Merge pull request #24122 from claudiob/fix-23795Rafael França2016-03-092-11/+26
|\ \ \ | | | | | | | | AppGenerator: allow both 'rake' and 'rails'
| * | | AppGenerator: allow both 'rake' and 'rails'claudiob2016-03-092-11/+26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This commit comes from the comments made by @matthewd at https://github.com/rails/rails/pull/23795/files#r54469637 and by @rafaelfranca at https://github.com/rails/rails/pull/23795/files#r54609364 The idea is that if you type (for example) "rake db:migrate" in an AppGenerator, then this should actually invoke `rake db:migrate` on the command line, whereas if you type "rails_command db:migrate", this should invoke `rails db:migrate`.
* | | Add changelog entry for #24115 [ci skip]Rafael Mendonça França2016-03-091-0/+5
| | |
* | | Merge pull request #24115 from garethson/instrumentation-headersRafael França2016-03-092-0/+7
|\ \ \ | |/ / |/| | Pass headers through to payload for logging.
| * | Pass headers through to payload for logging.Gareth du Plooy2016-03-082-0/+7
|/ / | | | | | | Make request headers available in the event payload so that it is available to attached ActionController::LogSubscribers.
* | Merge pull request #24062 from resure/redundant-escapesRafael França2016-03-084-4/+4
|\ \ | | | | | | Remove redundant regexp escapes in generators
| * | Remove redundant regexp escapes in generatorsGadzhi Gadzhiev2016-03-084-4/+4
| | |
* | | Merge pull request #23666 from meinac/fix_abstract_default_scope_bugSean Griffin2016-03-085-1/+38
|\ \ \ | | | | | | | | Execute default_scope defined by abstract class within the scope of subclass
| * | | Execute default_scope defined by abstract class within the scope of subclassMehmet Emin İNAÇ2016-03-085-1/+38
| | | |
* | | | Merge pull request #24067 from jch/error-message-when-missing-listen-dependencyArthur Nogueira Neves2016-03-081-1/+7
|\ \ \ \ | | | | | | | | | | Friendly error message if missing `listen` development dependency
| * | | | friendly error message if missing listenJerry Cheung2016-03-081-1/+7
|/ / / /
* | | | Merge pull request #24108 from gsamokovarov/web-console-console-plugKasper Timm Hansen2016-03-081-1/+1
|\ \ \ \ | | | | | | | | | | Advertise the console web-console feature
| * | | | Advertise the console web-console featureGenadi Samokovarov2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the latest version of Web Console, you can call `console` anywhere in your application and get a console with that binding in it. I think this is worth advertising, as it may be useful to do outside of controllers and views. [ci skip]
* | | | | Merge pull request #24102 from st0012/optimize-url-helperRichard Schneeman2016-03-081-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Optimize url helper
| * | | | | - Freeze strings in frequent used private methodStan Lo2016-03-081-11/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | reduce string allocation. - Use freezed empty string instead of create one every time we need to return it
* | | | | Merge pull request #24106 from gsamokovarov/fix-tests-after-e594000Kasper Timm Hansen2016-03-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix the tests after #24104
| * | | | | Fix the tests after e594000Genadi Samokovarov2016-03-081-2/+2
| | |/ / / | |/| | |
* / | | | add test case for schema dumping of PG bytea columns.Yves Senn2016-03-081-0/+9
|/ / / /
* | | | Merge pull request #24104 from gsamokovarov/dont-bound-web-console-versionsRafael França2016-03-082-3/+3
|\ \ \ \ | |/ / / |/| | | Drop the explicit version requirements for web-console
| * | | Drop the explicit version requirements for web-consoleGenadi Samokovarov2016-03-082-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between major versions 2 and 3, we hit a bug. It's fixed in version 3, however, the explicit 2.x requirement of `~> '2.0'` will prevent people from getting the fix with `bundle update` and they would have to explicitly set the constraint to `~> '3.0'`. For more information see: rails/web-console#178. I propose we drop the explicit version constraints in the Gemfile. Web Console has been relatively stable for the past couple of years, and I don't anticipate any major alterations, like we saw between major versions 1 and 2.
* | | Merge pull request #24101 from mechanicles/remove-extra-theArun Agrawal2016-03-081-1/+1
|\ \ \ | | | | | | | | Remove extra 'the' and unwanted comma [ci skip]
| * | | Remove extra 'the' and unwanted comma [ci skip]Santosh Wadghule2016-03-081-1/+1
|/ / /
* | | Merge pull request #24034 from kamipo/remove_outdated_commentArthur Nogueira Neves2016-03-071-1/+0
|\ \ \ | | | | | | | | Remove outdated comment [ci skip]
| * | | Remove outdated comment [ci skip]Ryuta Kamizono2016-03-041-1/+0
| | | | | | | | | | | | | | | | Currently column options handled by the type map in Rails 4.2.
* | | | Add changelog for batch touch records.Arthur Neves2016-03-071-0/+15
| |/ / |/| | | | | | | | | | | | | | related to #19324 and #18606 [skip ci]
* | | Merge pull request #23880 from bronson/extract-integration-behaviorRafael França2016-03-071-22/+35
|\ \ \ | | | | | | | | extract ActionDispatch::IntegrationTest::Behavior
| * | | extract ActionDispatch::IntegrationTest::BehaviorScott Bronson2016-03-071-22/+35
| | | | | | | | | | | | | | | | | | | | Similar to 176fbfd6, this makes it possible for other test frameworks to hook into Rails integration test facilities.
* | | | move changelog to right place [skip ci]Arthur Neves2016-03-071-6/+6
| | | |
* | | | Add changelog for #20997Arthur Neves2016-03-071-0/+6
| | | |
* | | | Merge pull request #23922 from rthbound/fix-funny-spellingArthur Nogueira Neves2016-03-071-2/+2
|\ \ \ \ | |/ / / |/| | | Fixes funny spelling in an AR test
| * | | Fixes funny spellingRyan T. Hosford2016-02-261-2/+2
| | | | | | | | | | | | | | | | - marked_for_destroyal -> marked_for_destruction
* | | | Merge pull request #24095 from maclover7/rm-incorrect-exampleJon Moss2016-03-071-2/+2
|\ \ \ \ | | | | | | | | | | Remove incorrect Rack documentation example
| * | | | Remove incorrect Rack documentation exampleJon Moss2016-03-071-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Sprockets` does not respond to the call method, so I changed the example to use a fake `MyRackApp`. Closes #22579. [ci skip]
* | | | Merge pull request #23939 from akshaymohite/fix-configuration-tests-semanticsSean Griffin2016-03-071-2/+2
|\ \ \ \ | | | | | | | | | | Fixed semantics of couple of tests in the configuration_test.rb [ci skip]
| * | | | Fixed couple of semantics in the configuration_test.rbAkshay2016-02-281-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #23993 from kamipo/no_need_to_extract_limit_for_booleanSean Griffin2016-03-072-5/+1
|\ \ \ \ | | | | | | | | | | No need to extract a limit for a boolean type
| * | | | No need to extract a limit for a boolean typeRyuta Kamizono2016-03-042-5/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:38:33 +0000