Rafael Mendonça França
10d0c43c79
Merge pull request #20423 from Erol/remove-assets-version-documentation
...
Remove `config.assets.version` from Configuring Rails Application Guide
2015-06-06 00:16:03 -03:00
Rafael Mendonça França
847a5ea7db
Merge pull request #20444 from y-yagi/can_use_path_helper_method_in_console
...
modify console of app method in that can use the path helpers
2015-06-06 00:07:45 -03:00
Rafael Mendonça França
eb460725f4
Merge pull request #20452 from repinel/add-bug-report-templates-to-ci
...
Add the bug report templates to the Travis CI build
2015-06-05 19:29:30 -03:00
Rafael Mendonça França
91ed77805d
Merge pull request #20442 from arunagw/aa-remove-warning-eager-load
...
Remove warning for setting eager_load
2015-06-05 19:06:29 -03:00
Roque Pinel
89550bc1a0
Add the bug report templates to the Travis CI build
...
The bug report templates are now executed from the `ci/travis.rb` when
`GEM` contains `guides`.
I started by creating a `test` task in `guides/Rakefile` to handle this,
but since inline `gemfile` must not be executed with `bundle exec`, that
rake task would not be consistent with others. So I went back by
executing them directly from `Build`.
Use inline Gemfile dependency when reporting gem bugs
2015-06-05 15:29:48 -05:00
Vijay Dev
423f14183f
Merge branch 'master' of github.com:rails/docrails
2015-06-05 19:49:44 +00:00
Kasper Timm Hansen
3673955506
Merge pull request #20443 from teoljungberg/thoughtbot-capitalization
...
[ci skip] Fix `thoughtbot` capitalization
2015-06-05 12:00:24 +02:00
yuuji.yaginuma
4fded7c069
modify console of app method in that can use the path helpers
2015-06-05 18:38:53 +09:00
Teo Ljungberg
cc849b609e
Fix thoughtbot
capitalization
...
The company name is spelled `thoughtbot` per
https://github.com/thoughtbot/presskit/blob/master/README.md#name
2015-06-05 11:29:03 +02:00
Arun Agrawal
382f52ddbb
Remove warning for setting eager_load
...
AppTemplate::Application.new does not run load hooks.
To load this configuration we need to use create which will
run load hooks to load this configuration.
2015-06-05 11:07:16 +02:00
Rafael Mendonça França
abe199b389
Merge pull request #20429 from repinel/improve-bug-report-template
...
[ci skip] Use inline Gemfile dependency when reporting bugs
2015-06-04 22:11:43 -03:00
Arthur Nogueira Neves
aefe1ef0e4
Merge pull request #20439 from jimmycuadra/require-as-duration
...
Require active_support/duration.
2015-06-04 21:55:21 +01:00
Jimmy Cuadra
bb5ffb77cc
Require active_support/duration.
...
ActiveSupport::TimeWithZone references `ActiveSupport::Duration` but
does not require it, which can result in a `LoadError` when required
directly without requiring a component less granular like
`active_support/time`, where the autoload for `ActiveSupport::Duration`
is set up.
2015-06-04 13:20:43 -07:00
Yves Senn
7220ffcffd
Merge pull request #20427 from ronakjangir47/http_path
...
Removed duplicate test cases for template execution
2015-06-04 08:43:27 +02:00
Rafael Mendonça França
ba37d5da06
Merge pull request #20430 from georgeclaghorn/tighten-up-suppression
...
Apply Active Record suppression to all saves
2015-06-04 01:33:03 -03:00
George Claghorn
ac002395d8
Apply Active Record suppression to all saves
...
It was not being applied to creates and updates attempted through the
non-bang save methods. This means that, for example, creation of
records for singular associations through the `create_*` methods was
not appropriately ignored in .suppress blocks.
2015-06-04 00:11:38 -04:00
Roque Pinel
ebd806cf4b
Use inline Gemfile dependency when reporting bugs
...
With Bundler `1.10.3`, it is possible to list the gems inline without the
need to create a `Gemfile` if none is found in the current directory.
2015-06-03 22:02:25 -05:00
Ronak Jangir
a68ffa731e
Removed duplicate test cases for template execution
2015-06-04 01:55:54 +05:30
Rafael Mendonça França
ae5f2b4e79
Document config.action_mailer.deliver_later_queue_name
...
Also add a CHANGELOG entry for #18587
[ci skip]
2015-06-03 13:28:21 -03:00
Rafael Mendonça França
cecbf9ed32
Merge pull request #18587 from chrismcg/allow_deliver_later_queue_name_to_be_configured
...
Allow configuration of ActionMailer queue name
2015-06-03 13:25:32 -03:00
Erol Fornoles
fba2473a5b
Remove reference to assets version option.
2015-06-03 16:17:27 +08:00
Aaron Patterson
6c44161834
pass check_ip and proxies to GetIp constructor
...
The `GetIp` class doesn't need to keep a reference to the middleware, so
there is no reason to pass the middleware instance to the `GetIp` class
2015-06-03 14:01:11 +08:00
Rafael Mendonça França
814a994e1b
Merge pull request #20421 from repinel/fix-clear-guides-and-related-api-docs
...
[ci skip] fix the `collection.clear` guide
2015-06-03 00:30:54 -03:00
Roque Pinel
efa1648f28
[ci skip] fix the collection.clear
guide
...
Improve the guide about `has_many` `collection.clear` to indicate
the behavior for each dependent strategy according to
`collection.delete_all`.
Based on #17179 , I changed the `collection.delete` docs to also
clarify the default strategy for each `hm` and `hm:t` associations.
Fixes #20170 .
2015-06-02 22:16:10 -05:00
Rafael Mendonça França
8193a09a1f
Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug"
...
This reverts commit a9d58c77da800bb0052c9bfa432828b02526022c, reversing
changes made to 041c2c879a3c4086ad3aa6d30fed1eede1d53c11.
Reason: The old behavior is how it was working in previous version of
Rails since 4.0.x so it is not safe to backport to a stable branch.
See https://github.com/rails/rails/issues/19626#issuecomment-89862258
and https://github.com/rails/rails/pull/15050#issuecomment-45333449
2015-06-02 20:57:54 -03:00
Santiago Pastorino
4519727cdb
Merge pull request #20383 from jonatack/fix-configurable-static-index-filename
...
Fix regression in #20017 wrong number of arguments error
2015-06-02 14:22:09 -03:00
Yves Senn
939d5a4932
Merge pull request #20387 from y-yagi/fix_engine_generated_controller_test
...
set engine's route in the functional test is generated in the engine
2015-06-02 16:20:40 +02:00
Sean Griffin
b6b13905e5
Skip test that fails from outdated sqlite3 on travis
2015-06-02 07:29:44 -06:00
Chris McGrath
f5a131aaea
Allow configuration of ActionMailer queue name
2015-06-02 10:49:49 +01:00
Yves Senn
de412eed58
Merge pull request #20413 from kddeisz/pluck_postgres_fix
...
Fix postgresql DISTINCT requirement in pluck test
2015-06-02 11:44:52 +02:00
Kevin Deisz
2dd95a775c
Fix postgresql DISTINCT requirement in pluck test
2015-06-02 05:36:24 -04:00
Rafael Mendonça França
c87cce1ddf
Merge pull request #20410 from schneems/schneems/boo-global-vars
...
Use block variable instead of global
2015-06-01 23:17:42 -03:00
schneems
e1a7260640
Use block variable instead of global
...
```ruby
require 'benchmark/ips'
Benchmark.ips do |x|
x.report("$&") {
"foo".sub(/f/) { $&.upcase }
}
x.report("block var") {
"foo".sub(/f/) {|match| match.upcase }
}
end
```
```
Calculating -------------------------------------
$& 48.658k i/100ms
block var 49.666k i/100ms
-------------------------------------------------
$& 873.156k (± 9.3%) i/s - 4.331M
block var 969.744k (± 9.2%) i/s - 4.818M
```
It's faster, and gets rid of a few "magic" global variables
2015-06-01 19:44:40 -05:00
yuuji.yaginuma
3612793475
add test to run generated test files inside mountable engine
2015-06-02 09:11:48 +09:00
Abdelkader Boudih
f40ccb5464
Merge pull request #20409 from davydovanton/doc-queue-adapter
...
Add documentation for QueueAdapter::queue_adapter
2015-06-02 00:04:56 +01:00
Anton Davydov
455e44cd68
[skip ci] Add documentation for QueueAdapter::queue_adapter
2015-06-02 00:24:04 +03:00
Rafael Mendonça França
8b67f28f4a
Merge pull request #20357 from ronakjangir47/remove_mocha1
...
Removed use of mocha from railties actions_test
2015-06-01 13:44:01 -03:00
Santiago Pastorino
651fa5edcd
Merge pull request #20406 from yoongkang/add_edge_sprockets
...
Use sprockets-rails from github repo
2015-06-01 13:35:31 -03:00
Ronak Jangir
655b8be814
Removed use of mocha from railties actions_test
2015-06-01 21:56:12 +05:30
Yoong Kang Lim
757dd93c7f
Use sprockets-rails from github repo
...
See #20397
2015-06-02 02:02:01 +10:00
Rafael Mendonça França
a4cf371e11
Merge pull request #20405 from manish-shrivastava/master
...
Fixed typos in rails guide
2015-06-01 12:58:51 -03:00
manish-shrivastava
8145880541
Fixed typos in guide
2015-06-01 21:16:30 +05:30
Rafael Mendonça França
cf484e3ee3
Merge pull request #19094 from phoet/have_bearer_be_valid_as_well
...
Have Bearer be valid as well
2015-06-01 12:41:18 -03:00
Rafael Mendonça França
4e63bde623
Merge pull request #20362 from kddeisz/enumerable_pluck
...
Allow Enumerable#pluck to take a splat.
2015-06-01 12:40:19 -03:00
phoet
4d4440c5a8
add changelog entry
2015-06-01 17:39:06 +02:00
Rafael Mendonça França
bdfc662a11
Merge pull request #20138 from tgxworld/deprecated_assert_template
...
Deprecate `assert_template` and `assigns()`.
2015-06-01 12:39:03 -03:00
Rafael Mendonça França
bd83caa666
Merge pull request #20284 from kaspth/fix-caching-test
...
Move expectation to instance level.
2015-06-01 12:38:08 -03:00
Rafael Mendonça França
03ddab096f
Merge pull request #20398 from nkondratyev/fix-time-change
...
Fix a range of values for parameters of the Time#change
2015-06-01 12:23:33 -03:00
Rafael Mendonça França
b8e8b67290
Merge pull request #20386 from yoongkang/circular_import
...
Fix circular import warning on build
2015-06-01 12:23:09 -03:00
Rafael Mendonça França
1bfa81bd6e
Merge pull request #20401 from yahonda/master_bigint_as_limit_19_in_oracle
...
Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for Oracle
2015-06-01 11:57:54 -03:00