aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #24144 from tjschuck/bcrypt_on_windows_fixedRafael França2016-03-101-7/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Version 3.1.11 works on Windows again
| * | | | | | Version 3.1.11 works on Windows againT.J. Schuck2016-03-101-7/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This undoes https://github.com/rails/rails/commit/7241498e51120b9847a8bc16cf48551db0f3e216 https://github.com/codahale/bcrypt-ruby/issues/128 is fixed and closed.
* | | | | | Merge pull request #24140 from gregmolnar/guidesVipul A M2016-03-101-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove obsolete i18n links from guides [ci skip]
| * | | | | | remove obsolete i18n links from guides [ci skip]Greg Molnar2016-03-101-5/+3
|/ / / / / /
* | | | | | Merge pull request #24137 from sidonath/patch-1Rafael França2016-03-101-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reorder paragraphs in the Routing API docs
| * | | | | | [skip ci] Reorder paragraphsDamir2016-03-101-3/+3
|/ / / / / / | | | | | | | | | | | | The previous order made sense [when `match` was used twice to point to two different actions](https://github.com/rails/rails/commit/7305ef842b675bf965f063de681a96294577fb84). In this case the note was misleading as posting to `/posts/:id` would still route to `show` action.
* | | | | | Merge pull request #24134 from kamipo/remove_needless_breakRafael França2016-03-101-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove needless `break;` [ci skip]
| * | | | | | Remove needless `break;` [ci skip]Ryuta Kamizono2016-03-101-1/+0
| | | | | | |
* | | | | | | Merge pull request #24136 from salmanasiddiqui/patch-1प्रथमेश Sonpatki2016-03-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed comments of add_foreign_key method
| * | | | | | | Fixed comments of add_foreign_key methodSalman Afzal Siddiqui2016-03-101-2/+2
|/ / / / / / / | | | | | | | | | | | | | | The comments of add_foreign_key method was displaying incorrect constraint name.
* | | | | | | revises whitespace in the gemspec of AV [ci skip]Xavier Noria2016-03-101-4/+4
| | | | | | |
* | | | | | | revises the homepage URL in the gemspecs [ci skip]Xavier Noria2016-03-108-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | References https://github.com/rails/homepage/issues/46.
* | | | | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-101-1/+1
| |/ / / / / |/| | | | |
* | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 23:25:55 +0000