Greg Molnar
71a3e6634c
remove obsolete i18n links from guides [ci skip]
2016-03-10 17:01:03 +01:00
Rafael França
5e496cbf35
Merge pull request #24137 from sidonath/patch-1
...
Reorder paragraphs in the Routing API docs
2016-03-10 11:05:21 -03:00
Damir
40f6d200cf
[skip ci] Reorder paragraphs
...
The previous order made sense [when `match` was used twice to point to two different actions](7305ef842b
). In this case the note was misleading as posting to `/posts/:id` would still route to `show` action.
2016-03-10 15:01:27 +01:00
Rafael França
d9b42cfd34
Merge pull request #24134 from kamipo/remove_needless_break
...
Remove needless `break;` [ci skip]
2016-03-10 10:51:37 -03:00
प्रथमेश Sonpatki
be9ee039b5
Merge pull request #24136 from salmanasiddiqui/patch-1
...
Fixed comments of add_foreign_key method
2016-03-10 16:36:28 +05:30
Salman Afzal Siddiqui
56570ebfba
Fixed comments of add_foreign_key method
...
The comments of add_foreign_key method was displaying incorrect constraint name.
2016-03-10 15:40:37 +05:00
Ryuta Kamizono
7fc10468b6
Remove needless `break;` [ci skip]
2016-03-10 18:09:01 +09:00
Xavier Noria
841c74ccba
revises whitespace in the gemspec of AV [ci skip]
2016-03-10 07:55:42 +01:00
Xavier Noria
1eb27fafa9
revises the homepage URL in the gemspecs [ci skip]
...
References https://github.com/rails/homepage/issues/46 .
2016-03-10 07:55:27 +01:00
Xavier Noria
55984afe2c
prefer require_relative over require + File.expand_path
2016-03-10 07:34:01 +01:00
Rafael França
2506c79793
Merge pull request #24128 from y-yagi/add_return_values_to_example
...
add return values to example [ci skip]
2016-03-09 20:10:53 -03:00
yuuji.yaginuma
5ad722c23b
add return values to example [ci skip]
2016-03-10 07:48:23 +09:00
Matthew Draper
bf79b81740
Revert "Merge pull request #24125 from dharamgollapudi/patch-3"
...
This reverts commit b3c487515c
, reversing
changes made to 4b43651884
.
2016-03-10 07:41:31 +10:30
Rafael França
b3c487515c
Merge pull request #24125 from dharamgollapudi/patch-3
...
Rename dependencies.rake to cache_digests.rake
2016-03-09 17:09:38 -03:00
Dharam Gollapudi
f819f20601
Rename dependencies.rake to cache_digests.rake
...
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.
2016-03-09 12:06:19 -08:00
Rafael França
4b43651884
Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchers
...
Remove passing `with_dispatchers` to AppGenerator
2016-03-09 15:25:16 -03:00
Rafael França
0934b9e7cf
Merge pull request #24123 from mperham/master
...
Job payload should be symmetric across JSON dump/load
2016-03-09 14:56:36 -03:00
Rafael França
1e92fe7352
Merge pull request #24121 from y-yagi/use_same_to_type_object
...
use same name to type object
2016-03-09 14:47:42 -03:00
Mike Perham
8c98186742
Add JSON round trip verification testcase
2016-03-09 09:28:16 -08:00
Mike Perham
702ef37767
Job payload should be symmetric across JSON dump/load
...
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.
2016-03-09 08:56:21 -08:00
Sean Griffin
5cd2beb013
Add `ActionController::Parameters#dig`
...
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`.
2016-03-09 09:49:23 -07:00
Rafael França
20f2727ba4
Merge pull request #24122 from claudiob/fix-23795
...
AppGenerator: allow both 'rake' and 'rails'
2016-03-09 13:26:23 -03:00
Rafael Mendonça França
fe8239e35a
Add changelog entry for #24115 [ci skip]
2016-03-09 12:48:56 -03:00
Rafael França
49e6d0a99c
Merge pull request #24115 from garethson/instrumentation-headers
...
Pass headers through to payload for logging.
2016-03-09 12:37:50 -03:00
claudiob
5c99a4b93e
AppGenerator: allow both 'rake' and 'rails'
...
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`.
2016-03-09 07:29:17 -08:00
Prathamesh Sonpatki
486bffa6ce
Remove passing `with_dispatchers` to AppGenerator
...
- 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.
2016-03-09 19:37:32 +05:30
yuuji.yaginuma
163df5d6a0
use same name to type object
...
Follow up to #24079
2016-03-09 20:47:45 +09:00
Gareth du Plooy
2c5c1276a8
Pass headers through to payload for logging.
...
Make request headers available in the event payload so that it is available to attached ActionController::LogSubscribers.
2016-03-08 22:59:27 -05:00
Rafael França
b165d73f2c
Merge pull request #24062 from resure/redundant-escapes
...
Remove redundant regexp escapes in generators
2016-03-08 21:58:48 -03:00
Sean Griffin
da1fecce32
Merge pull request #23666 from meinac/fix_abstract_default_scope_bug
...
Execute default_scope defined by abstract class within the scope of subclass
2016-03-08 13:10:45 -07:00
Arthur Nogueira Neves
8c2a697380
Merge pull request #24067 from jch/error-message-when-missing-listen-dependency
...
Friendly error message if missing `listen` development dependency
2016-03-08 11:46:13 -05:00
Jerry Cheung
78dd3f6f96
friendly error message if missing listen
2016-03-08 08:42:44 -08:00
Kasper Timm Hansen
6ef5c64ab8
Merge pull request #24108 from gsamokovarov/web-console-console-plug
...
Advertise the console web-console feature
2016-03-08 16:43:13 +01:00
Richard Schneeman
1f5709086f
Merge pull request #24102 from st0012/optimize-url-helper
...
Optimize url helper
2016-03-08 09:31:28 -06:00
Kasper Timm Hansen
bc41b2e830
Merge pull request #24106 from gsamokovarov/fix-tests-after-e594000
...
Fix the tests after #24104
2016-03-08 16:26:45 +01:00
Yves Senn
8b68ab6088
add test case for schema dumping of PG bytea columns.
2016-03-08 16:09:59 +01:00
Genadi Samokovarov
7b8c90cf8b
Advertise the console web-console feature
...
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]
2016-03-08 16:56:36 +02:00
Stan Lo
f785413ce3
- Freeze strings in frequent used private method
...
reduce string allocation.
- Use freezed empty string instead of create one every time we need to return it
2016-03-08 22:53:23 +08:00
Genadi Samokovarov
61a51a5ea3
Fix the tests after e594000
2016-03-08 16:18:58 +02:00
Rafael França
818a715dd3
Merge pull request #24104 from gsamokovarov/dont-bound-web-console-versions
...
Drop the explicit version requirements for web-console
2016-03-08 10:31:37 -03:00
Genadi Samokovarov
e5940003ae
Drop the explicit version requirements for web-console
...
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.
2016-03-08 15:17:51 +02:00
Mehmet Emin İNAÇ
0784dccc4f
Execute default_scope defined by abstract class within the scope of subclass
2016-03-08 14:56:00 +02:00
Gadzhi Gadzhiev
37606d016d
Remove redundant regexp escapes in generators
2016-03-08 15:30:12 +03:00
Arun Agrawal
a61bf5f5b6
Merge pull request #24101 from mechanicles/remove-extra-the
...
Remove extra 'the' and unwanted comma [ci skip]
2016-03-08 15:44:32 +05:30
Santosh Wadghule
4300213c01
Remove extra 'the' and unwanted comma [ci skip]
2016-03-08 15:40:29 +05:30
Arthur Nogueira Neves
70e7b87ddb
Merge pull request #24034 from kamipo/remove_outdated_comment
...
Remove outdated comment [ci skip]
2016-03-07 16:31:30 -05:00
Arthur Neves
f5b553c94d
Add changelog for batch touch records.
...
related to #19324 and #18606
[skip ci]
2016-03-07 16:10:18 -05:00
Rafael França
a38afb3e55
Merge pull request #23880 from bronson/extract-integration-behavior
...
extract ActionDispatch::IntegrationTest::Behavior
2016-03-07 18:05:02 -03:00
Arthur Neves
75216b533b
move changelog to right place [skip ci]
2016-03-07 16:02:49 -05:00
Arthur Neves
d8a53b49a7
Add changelog for #20997
2016-03-07 16:00:12 -05:00