Commit Graph

47865 Commits

Author SHA1 Message Date
Yves Senn
38a7d801ba Merge pull request #17518 from prathamesh-sonpatki/fix-activesupport
Fix broken string_ext_test due to change in timezone
2014-11-05 10:29:20 +01:00
Prathamesh Sonpatki
e130a0e7b4 Fix broken string_ext_test due to change in timezone
- Russian time was changed to UTC+3 from UTC+4 recently. This broke the
  string_to_ext test.
2014-11-05 14:27:07 +05:30
Abdelkader Boudih
a9d1990169 Merge pull request #17514 from y-yagi/configuring_guide
[ci skip] fix `config.assets.digest` default value
2014-11-05 07:01:39 +00:00
yuuji.yaginuma
d027e2759d [ci skip] fix config.assets.digest default value 2014-11-05 15:21:10 +09:00
Zachary Scott
bb441843a7 Merge pull request #17513 from eileencodes/cleanup-rails-4.2-release-notes
Fixup spelling and grammar in 4.2 guides
2014-11-04 18:29:00 -08:00
eileencodes
4ea3e65c18 [ci skip] Fixup spelling and grammar in 4.2 guides
Capitalize CSS, SQL

Change spelling of favour to favor - updated for consistency,
the rest of the document uses "favor".

Grammar / spelling pass
2014-11-04 21:19:20 -05:00
Aaron Patterson
ffb6d37c04 Merge branch '17106'
* 17106:
  add lib to $LOAD_PATH on application inhertence. fixes #17106
  add a test for #17106
2014-11-04 15:00:56 -08:00
Aaron Patterson
9dbcac7811 add lib to $LOAD_PATH on application inhertence. fixes #17106 2014-11-04 14:54:52 -08:00
Paul Annesley
4bcb094224 activerecord: rake db:create shows underlying error message. 2014-11-04 14:20:37 -08:00
Aaron Patterson
0d5a384498 add a test for #17106 2014-11-04 14:14:03 -08:00
Zachary Scott
502c45a342 Merge pull request #17508 from prathamesh-sonpatki/mention-adding-resources-to-routes
Mention that articles resource should be added by user in getting started guide

Fixes #17507 [ci skip]
2014-11-04 12:21:45 -08:00
Prathamesh Sonpatki
00d14936b0 Mention that articles resource should be added by user in getting started guide
[ci skip]
2014-11-05 00:44:09 +05:30
Yves Senn
7596cab62f Merge pull request #17443 from tomeara/added_jsonb_to_postgres_database_types
Added SchemaDumper support for tables with jsonb columns
2014-11-04 19:58:38 +01:00
Ted O'Meara
9007b789e1 Added SchemaDumper support for tables with jsonb columns. 2014-11-04 12:55:07 -05:00
Rafael Mendonça França
8602fc5e11 Merge pull request #17480 from gsamokovarov/exception-wrapper-traces
Move DebugExceptions#traces_from_wrapper to ExceptionWrapper
2014-11-04 14:58:07 -02:00
Vijay Dev
9887a2cfe5 Merge branch 'master' of github.com:rails/rails 2014-11-04 13:20:22 +00:00
Vijay Dev
b670fadb97 fix typo [ci skip] 2014-11-04 18:47:06 +05:30
Zachary Scott
061687c568 Merge pull request #17504 from Gaurav2728/gaurav-update_edgeguide
update rails version for earlier releases in edgeguides [ci skip]
2014-11-04 00:24:33 -08:00
Gaurav Sharma
40f8ad4fa9 update rails version for earlier releases in edgeguides 2014-11-04 13:12:37 +05:30
Zachary Scott
e65e094a1d Merge pull request #17488 from rishijain/update_docs_3
minor docs change [ci skip]
2014-11-03 22:43:07 -08:00
Zachary Scott
d73055025e Merge pull request #17500 from rishijain/update_docs_4
added example for hash slice method [ci skip]
2014-11-03 19:43:48 -08:00
Rishi Jain
06467ad7fe fixed typo [ci skip] 2014-11-04 09:13:12 +05:30
Rishi Jain
78d4f2bcfb added example for hash slice method [ci skip] 2014-11-04 09:08:57 +05:30
Zachary Scott
77c0256409 Correct fixed-width doc syntax, thanks to @sikachu for pointing it out!
From dc5854f and c07c0b2 [ci skip]
2014-11-03 19:31:31 -08:00
Zachary Scott
b049d792bd Document included ability of AJ::QueueName module for class methods [ci skip] 2014-11-03 19:26:04 -08:00
Zachary Scott
7ea0f26801 Add documentation of AJ::QueueAdapter class methods module [ci skip] 2014-11-03 19:25:44 -08:00
Zachary Scott
60fcf60c7b Document AJ::Execution class methods module [ci skip] 2014-11-03 19:23:36 -08:00
Zachary Scott
c07c0b268e Document the module which includes perform_later for AJ::Enqueuing [ci skip] 2014-11-03 19:22:57 -08:00
Zachary Scott
73161c5744 Add documentation for class methods module included for AJ::Core used
for serialization and deserialization of jobs. [ci skip]
2014-11-03 19:22:11 -08:00
Zachary Scott
dc5854f382 Document the class methods include module for AJ::Callbacks [ci skip] 2014-11-03 19:21:43 -08:00
Rafael Mendonça França
11370eea81 Merge pull request #17498 from rochefort/remove-redundant-to_s
Remove redundant `to_s` in interpolation
2014-11-03 20:06:42 -02:00
rochefort
797a7a7c83 Remove redundant to_s in interpolation 2014-11-04 07:00:24 +09:00
Rafael Mendonça França
faa8649dea Remove unneeded autoload 2014-11-03 16:38:50 -02:00
Zachary Scott
b67c36f5f4 Merge pull request #17494 from craftsmen/issue-17484
Change `rails` to `bin/rails` in getting started, fix #1748 [ci skip]
2014-11-03 10:00:09 -08:00
kevcha
b523b5a3f4 Change rails to bin/rails in getting started, fix #1748 [ci skip] 2014-11-03 18:43:29 +01:00
Genadi Samokovarov
c7f2ee2213 Move DebugExceptions#traces_from_wrapper to ExceptionWrapper
ActionDispatch::ExceptionWrapper seems to be the more natural place for
this method to live in.
2014-11-03 19:12:04 +02:00
Peter West
2e085f67d4 Delegate comparison operator to value 2014-11-03 16:34:44 +00:00
Rafael Mendonça França
af9702c015 Merge pull request #17487 from pabloh/avoid_allocations
Avoid unnecessary allocations and method calls
2014-11-03 12:14:53 -02:00
Rafael Mendonça França
4259cc0c50 Merge pull request #17383 from rwz/string-remove
Make `String#remove` and `String#remove!` accept multiple arguments

Conflicts:
	activesupport/CHANGELOG.md
2014-11-03 12:09:26 -02:00
Rishi Jain
93258c528c minor docs change [ci skip] 2014-11-03 12:37:39 +05:30
Benjamin Fleischer
db5f1a46f2 secret_token is now saved in Rails.application.secrets.secret_token
- `secrets.secret_token` is now used in all places `config.secret_token` was
  - `secrets.secret_token`, when not present in `config/secrets.yml`,
    now falls back to the value of `config.secret_token`
  - when `secrets.secret_token` is set, it over-writes
    `config.secret_token` so they are the same (for backwards-compatibility)
  - Update docs to reference app.secrets in all places
    - Remove references to `config.secret_token`, `config.secret_key_base`
- Warn that missing secret_key_base is deprecated
- Add tests for secret_token, key_generator, and message_verifier
  - the legacy key generator is used with the message verifier when
    secrets.secret_key_base is blank and secret_token is set
  - app.key_generator raises when neither secrets.secret_key_base nor
    secret_token are set
  - app.env_config    raises when neither secrets.secret_key_base nor
    secret_token are set
- Add changelog

Run focused tests via
ruby -w -Itest test/application/configuration_test.rb -n '/secret_|key_/'
2014-11-02 21:21:09 -06:00
Pablo Herrero
0488d00211 Avoid unnecessary allocations/calls 2014-11-02 21:40:47 -03:00
Andrew White
badd616cc9 Add comment to point out String#[] is intentional 2014-11-02 23:58:30 +00:00
yuuji.yaginuma
1b958e0a79 Revert "Replace String index juggling with Pathname goodness in db:fixtures:load"
This reverts commit 482fdad5ef8a73688b50bba3991dd4ef6f286edd.

Fixes #17237.
2014-11-02 23:58:30 +00:00
Sean Griffin
999a07e3b9 Add an assert_deprecated for sanitize_sql_hash_for_conditions 2014-11-02 14:01:57 -07:00
Sean Griffin
76d6d88280 Handle RangeError from casting in find_by and find_by! on Relation
We should not behave differently just because a class has a default
scope.
2014-11-02 13:54:16 -07:00
Sean Griffin
d5902c9e7e Revert deprecation of sanitize_sql_hash_for_assignment
This method is still used by `update_all`
2014-11-02 13:52:34 -07:00
Sean Griffin
eb921000a1 Deprecate sanitize_sql_hash_ methods on ActiveRecord
These appear to be implementation relics of times past. They duplicate
the logic in Relation, and are no longer used internally.
2014-11-02 13:34:52 -07:00
Sean Griffin
d3fbd9dbb8 Pass the SelectManager, rather than the AST when querying w/ Relation
Arel specifically handles `SelectManager`, with the same logic we're
currently performing. The AST is `Enumerable`, which Arel looks for
separately now.
2014-11-02 12:23:44 -07:00
Ryan Selk
98626e27c1 Add a section about job testing [ci skip]
* Cover lower level job testing (assertions about the execution of the
  job itself).
* Add a table with the custom assertions provided by Active Job's
  `TestHelper` module.
* Add an example testing job queuing inside a model
2014-11-02 12:59:58 +01:00