Commit Graph

55973 Commits

Author SHA1 Message Date
Ryuta Kamizono 943bb6d7ac Update `Gemfile.lock` 2016-01-26 08:53:30 +09:00
Aaron Patterson 6dfab475ca Merge branch '5-0-beta-sec'
* 5-0-beta-sec:
  bumping version
  fix version update task to deal with .beta1.1
  Eliminate instance level writers for class accessors
  allow :file to be outside rails root, but anything else must be inside the rails view directory
  Don't short-circuit reject_if proc
  stop caching mime types globally
  use secure string comparisons for basic auth username / password
2016-01-25 11:25:11 -08:00
Aaron Patterson 908c011395 bumping version 2016-01-25 10:22:15 -08:00
Aaron Patterson 23c36725a0 fix version update task to deal with .beta1.1 2016-01-25 10:22:03 -08:00
Jon Moss 14e92bac1a Merge pull request #23226 from vipulnsward/20808-fix
Fix nodoc to internal class error document some of them
2016-01-25 12:41:45 -05:00
Vipul A M c7281b37ac Fix nodoc to internal class error document some of them
[ci skip]
Fixes #20808

[Vipul A M & Julio Lopez]
2016-01-25 23:04:40 +05:30
Richard Schneeman 4962b44755 Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadata
[close #23009] Limit key length
2016-01-25 08:54:44 -06:00
Jon Moss ceea3811e2 Merge pull request #23208 from vipulnsward/testing-pass-2
Pass 2 over testing guide
2016-01-25 08:23:38 -05:00
Kasper Timm Hansen 8604bf8caf Merge pull request #23229 from vipulnsward/23221-also-verify-count
When verifying size of relation, also verify count is ok.
2016-01-25 10:00:46 +01:00
Vipul A M 0eef20af66 When verifying size of relation, also verify count is ok. 2016-01-25 13:41:21 +05:30
Yves Senn 07a2f4ef1c Merge pull request #23210 from sachin21/change_permission
Change permission to readonly [ci skip]
2016-01-25 08:49:02 +01:00
Rafael França 5119171d39 Merge pull request #23221 from vipulnsward/23209-fix-missin_source_type
Add missing source_type if provided on hmt which belongs to an sti re…
2016-01-24 13:08:32 -05:00
Rafael França 6b89c4a247 Merge pull request #23051 from prathamesh-sonpatki/fix-collection-cache-key
Fix AR::Relation#cache_key to remove select scope added by user
2016-01-24 13:04:36 -05:00
Rafael Mendonça França 9e6969412b Revert "Merge pull request #23218 from karlfreeman/bump_mail"
This reverts commit 62aa850fee, reversing
changes made to 8c1f248c58.

There is no reason to disallow mail 2.5 so we don't need to bump the
version constraint since people are still able to use mail 2.6 and get
all the memory saving that was pointed in the pull request description.
2016-01-24 12:34:05 -05:00
Kasper Timm Hansen 323ec89aab Merge pull request #23185 from droptheplot/actioncable-custom-channels
ActionCable: Allow adding custom paths for channels
2016-01-24 18:14:59 +01:00
Prathamesh Sonpatki 29cf0dd9f4 Fix AR::Relation#cache_key to remove select scope added by user
- We don't need the select scope added by user as we only want to max
  timestamp and size of the collection. So we already know which columns
  to select.
- Additionally having user defined columns in select scope blows the cache_key
  method with PostGreSQL because it needs all `selected` columns in the group_by
  clause or aggregate function.
- Fixes #23038.
2016-01-24 22:36:13 +05:30
Vipul A M b334bc93c6 Add missing source_type if provided on hmt which belongs to an sti record
Fixes #23209
2016-01-24 22:25:12 +05:30
Santiago Pastorino 62aa850fee Merge pull request #23218 from karlfreeman/bump_mail
Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6
2016-01-24 13:22:56 -03:00
Kasper Timm Hansen 8c1f248c58 Merge pull request #23081 from prathamesh-sonpatki/fix-cache-key-for-queries-with-offset
Fix ActiveRecord::Relation#cache_key for relations with no results
2016-01-24 16:24:31 +01:00
Kasper Timm Hansen 1969753974 Merge pull request #23212 from vipulnsward/bin-rails
Be consistent in testing outputs from railties test and use /bin/rails
2016-01-24 16:05:20 +01:00
David Heinemeier Hansson 53a9da4cf2 Merge pull request #23152 from matthewd/actioncable-concurrent
Eliminate the EventMachine dependency
2016-01-24 16:00:15 +01:00
Jon Moss 3bebb65e86 Merge pull request #23213 from Ferdy89/docs_format_contraints_with_glob
Update the exception of format constraint in routes
2016-01-24 09:46:16 -05:00
Akira Matsuda 8f35fcec56 Put test-case dependent helper Class inside the test case
This fixes ⚠️ previous definition of download was here
2016-01-24 23:37:26 +09:00
Akira Matsuda bd2178f115 ⚠️ mismatched indentations at 'end' with 'unless' 2016-01-24 23:37:26 +09:00
Akira Matsuda 75b199753c Test files has to be named *_test.rb 2016-01-24 23:37:26 +09:00
Vipul A M e3b04447f4 Be consistent in testing outputs from railties test and use /bin/rails everywhere(the default behaviour now) instead of mix of /bin/rake /bin/rails everywhere
[Ryo Hashimoto & Vipul A M]
2016-01-24 20:01:02 +05:30
Karl Freeman cef8b543b5 Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6
Mails downstream dependency (Mime-types) has been shown to decrease
memory usage significantly in its 3.0 release. This memory decrease
will be a big win for users upgrading to Rails 5.

Lets nudge users to upgrade Mail alongside Rails.
2016-01-24 14:13:36 +00:00
Matthew Draper 235c75972e Merge pull request #23179 from prathamesh-sonpatki/pare-back-default-index-option-to-references
Pare back default `index` option for the migration generator
2016-01-25 00:28:31 +10:30
Prathamesh Sonpatki 909818b93b Pare back default `index` option for the migration generator
- Using `references` or `belongs_to` in migrations will always add index
  for the referenced column by default, without adding `index:true` option
  to generated migration file.
- Users can opt out of this by passing `index: false`.
- Legacy migrations won't be affected by this change. They will continue
  to run as they were before.
- Fixes #18146
2016-01-24 18:48:15 +05:30
Matthew Draper 503fe757c7 Ditch the EM error logging helper
We're no longer doing our work in the EM event loop, so errors are quite
unlikely, and if they do occur, they're not really our responsibility to
handle.
2016-01-24 22:54:04 +10:30
Matthew Draper 322dca293b Import the relevant portions of faye-websocket
(as adapted to use concurrent-ruby / nio4r instead of eventmachine)
2016-01-24 22:52:40 +10:30
Matthew Draper 68a9060d02 Using a hacked faye-websocket, drop EventMachine 2016-01-24 22:51:06 +10:30
Matthew Draper dcdadd5e82 Merge pull request #23217 from matthewd/adapter-tests
ActionCable Adapter tests
2016-01-24 22:30:48 +10:30
Matthew Draper 9ff28c10eb Add tests for the ActionCable adapters 2016-01-24 21:13:40 +10:30
Matthew Draper 7363ad43f5 Allow subscription adapters to be shut down 2016-01-24 19:00:06 +10:30
Matthew Draper e3a0ad83da Merge pull request #23216 from prathamesh-sonpatki/fix-23137
Rails::Generators::Actions#gem should work even if frozen string is passed as argument
2016-01-24 16:38:58 +10:30
Prathamesh Sonpatki 693f1beeee Rails::Generators::Actions#gem should work even if frozen string is passed as argument
- Fixes #23137.
2016-01-24 11:04:52 +05:30
Matthew Draper b17a7e4c4d Add Async and Inline adapters
Just like their ActiveJob equivalents, these only work within the
current process.
2016-01-24 15:52:47 +10:30
Matthew Draper e81bb80cb4 Normalize on no arguments for the success callback 2016-01-24 15:52:47 +10:30
Matthew Draper dccc15d403 Split internal subscriber tracking from Postgres adapter 2016-01-24 15:52:47 +10:30
Fernando Seror 1307c8d0ea Update the exception of format constraint in routes
Per https://github.com/rails/rails/issues/20264
[ci skip]
2016-01-23 19:15:46 -06:00
Andrew White 83d2c39d5e Add environment back to db:structure:load
Because of the changes in #22967 the assumption in #18907 is no longer
true because the internal metadata feature for Active Record requires
a working environment.
2016-01-23 19:14:39 +00:00
Eileen M. Uchitelle 75a8973c7a Merge pull request #23102 from yui-knk/foreign_type_to_singular_association
Define `:foreign_type` as a valid option in `SingularAssociation`
2016-01-23 11:48:41 -05:00
Vipul A M 6026b37ffc Pass 2 over testing guide
- Grammar fixes
- Wordsmitting
- Fixed wrong statement about association usage in fixtures
- Changed association name from 'one' to 'first' instead
- More consistent usage of we/our
- Mentions assert_select is below, not already covered in Integration test.

[ci skip]
2016-01-23 21:24:32 +05:30
Sean Griffin 67c1719012 Use the database type to deserialize enum
This fixes incorrect assumptions made by e991c7b that we can assume the
DB is already casting the value for us. The enum type needs additional
information to perform casting, and needs a subtype.

I've opted not to call `super` in `cast`, as we have a known set of
types which we accept there, and the subtype likely doesn't accept them
(symbol -> integer doesn't make sense)

Close #23190
2016-01-23 08:44:16 -07:00
Andrew White 8de32bb252 Document scoping issue with Time.use_zone
The Time.use_zone method will only affect ActiveSupport::TimeWithZone
instances created inside of the block passed to Time.use_zone. This
could be confusing when fetching a model and then reading the attribute
before the block and it not changing afterwards because Active Record
caches the conversion from the database value.

Since changing the behavior of Active Record to recreate the value on
every attribute read is an expensive operation the best we can do is
to document the issue.

Fixes #23195.

[ci skip]
2016-01-23 15:01:55 +00:00
Satoshi Ohmori 109b30ff8b Change permission to readonly
changed from 755 to 644.
I executed `chmod -x guides/assets/javascripts/responsive-tables.js`.
[ci skip]
2016-01-23 21:48:15 +09:00
Kasper Timm Hansen 39ea2b09ed Merge pull request #23206 from joyvuu-dave/action_cable_api_fix
prevent --skip-action-cable from erroring when --api option is used
2016-01-23 08:21:41 +01:00
Dave Riddle 578af21a41 prevent --skip-action-cable from erroring when --api option is used 2016-01-22 22:39:01 -08:00
प्रथमेश Sonpatki 4fdc56d578 Merge pull request #23207 from y-yagi/fix_path_of_actioncable_config
fix path of Action Cable configuration file [ci skip]
2016-01-23 11:42:40 +05:30