Richard Schneeman
c83d1e5508
Merge pull request #22280 from yui-knk/fix_chagnelog_actionview
...
[ci skip] Fix CHANGELOG.md format from list to italic.
2015-11-12 21:48:21 -06:00
Richard Schneeman
c7368fd86d
Merge pull request #22279 from yui-knk/fix_object_partial_false
...
Respect value of `:object` if `:object` is false when rendering
2015-11-12 21:47:43 -06:00
yui-knk
0dc1d8c037
[ci skip] Fix CHANGELOG.md format from list to italic.
2015-11-13 12:43:50 +09:00
yui-knk
429bd260c1
Respect value of :object
if :object
is false when rendering
...
This commit fixes the bug convering `false` to `locals[as]` when
`options[:object]` is `false` (close #22260 ).
2015-11-13 12:26:15 +09:00
Kasper Timm Hansen
0db310586a
Prefer Minitest's location for test failures.
...
When running tests, the Rails test runner would report the start of the test method as the test failure.
For this test:
```ruby
1 require 'test_helper
2
3 class BunnyTest < ActiveSupport::TestCase
4 test "something failing" do
5 assert false, 'This failed'
6 end
7 end
```
The runner outputs 5 instead of 4:
```
............................................F
This failed
bin/rails test test/models/bunny_test.rb:5
........
```
2015-11-12 21:39:58 +01:00
Kasper Timm Hansen
49eefe123a
Don't match specific line numbers in reporter tests.
...
The overall syntax of the file path is more important, not the exact line it was on.
2015-11-12 21:22:40 +01:00
Rafael Mendonça França
1576f47c23
Ignore Gemfile.lock in the release task
2015-11-12 15:12:34 -02:00
Rafael França
921ce291d4
Merge pull request #22277 from jwworth/pull-request/fix-typo-1447344392
...
Fix typo [ci skip]
2015-11-12 14:38:50 -02:00
Yves Senn
0e04ae3d2a
Merge pull request #22259 from daisuko/remove_compiled_root_from_static_rb
...
remove unnecessary @compiled_root from static.rb
2015-11-12 17:18:11 +01:00
Jake Worth
432c7a5b76
Fix typo [ci skip]
2015-11-12 10:06:44 -06:00
Yves Senn
19398ab98a
Merge pull request #21601 from yui-knk/fix/ar_tables_without_view2
...
All `AR::ConnectionAdapters#tables` return only tables(exclude views)
2015-11-12 16:24:09 +01:00
Kasper Timm Hansen
53d04697d5
Merge pull request #22273 from JuanitoFatas/patch/fix-a-warning-in-active-support-test-suite
...
Fix instance variable not defined warning from Active Support test suite
2015-11-12 15:10:36 +01:00
JuanitoFatas
67a7a1526f
Fix instance variable not defined warning from Active Support test suite
...
Before
./Users/Juan/dev/rails/activesupport/test/file_update_checker_shared_tests.rb:20: warning: instance variable @tmpdir not initialized
After
No warnings
2015-11-12 17:41:13 +08:00
Xavier Noria
99c1043aa9
base (refined) Pathname#ascendant_of? also on Pathname#ascend
...
A small rewrite in a last attempt at writing obvious and portable code
without manual string manipulation.
Note that Pathname#== uses string comparison on Windows, so if client
code passes "C:\foo" and "c:/foo/bar" the predicate won't see the
former is an ascendant of the latter. Risky business.
2015-11-12 02:12:46 +01:00
Xavier Noria
7d242be5a4
Merge pull request #22269 from dharamgollapudi/patch-1
...
Use the file watcher defined by the app config
2015-11-11 23:34:53 +01:00
Dharam Gollapudi
ea3b6ac6ca
Use the file watcher defined by the app config
...
This can make use of the FileEventedUpdateChecker, if available.
2015-11-11 14:08:44 -08:00
Xavier Noria
18b44ff1e4
let filter_out_descendants do less passes
...
Whatever the inner loop selects, we already know is a descendant and
can be filtered out right away from dirs_sorted_by_nparts to skip
useless iterations.
2015-11-11 21:35:34 +01:00
Rafael França
5da4be67a0
Merge pull request #22264 from rails/fix-21230
...
Show middleware classes on /rails/info/properties
2015-11-11 16:57:42 -02:00
claudiob
6c75bcbbb7
Show middleware classes on /rails/info/properties
...
Closes #21230 by following the indication of @rafaelfranca:
> I think the output change would be simpler.
> What is really important to show is the class of the middleware, so we should change the output to show that.
2015-11-11 09:46:23 -08:00
Claudio B
f94e9a69b0
Merge pull request #22258 from rymai/patch-1
...
Fix typo: "in" should be "is"
2015-11-11 05:40:51 -08:00
daisuko
3c217faa86
remove unnecessary @compiled_root from static.rb
2015-11-11 21:13:33 +09:00
Xavier Noria
472b8e054b
revises the implementation of Pathname#ascendant_of? (in refinement)
2015-11-11 10:18:43 +01:00
Rémy Coutable
202c5c6395
Fix typo: "in" should be "is"
2015-11-11 09:51:37 +01:00
Xavier Noria
e42a5fd3d5
normalizes spacing in a CHANGELOG [ci skip]
2015-11-11 07:22:28 +01:00
Xavier Noria
d0ae8adfb7
Merge branch 'fxn-master'
2015-11-11 07:09:36 +01:00
Paul Kehrer
1583c8290a
update docs for MessageEncryptor#new to recommend a KDF [ci skip]
2015-11-11 07:08:49 +01:00
Jon Pascoe
2f4f4d2cf1
Add days_in_year method
2015-11-11 07:08:49 +01:00
Christoph
9ccb341fbf
Fix week_field returning invalid value
...
According to the W3 spec[1] the value should use a 1-based index
and not a 0-based index for the week number.
[1]: http://www.w3.org/TR/html-markup/datatypes.html#form.data.week
2015-11-11 07:08:20 +01:00
Yuri Kasperovich
cff8b4951f
Minor fix in Module#mattr_reader documentation
2015-11-11 07:08:20 +01:00
James Coleman
8c9e95f970
Clarify i18n active[model/record] key differences
...
I spent a decent amount of time the other day trying to figure out why my active model including class wasn't generating the properly localized validation messages, and a note like this would have saved me a lot of time.
2015-11-11 07:08:20 +01:00
Michael Grosser
f87774bb8b
fast and consistent return when local_cache does not exist
2015-11-11 07:08:20 +01:00
Xavier Noria
7edc8d9600
modernizes the test definitions in the file monitors suite
2015-11-11 07:00:47 +01:00
Rafael França
2af7338bdf
Merge pull request #22255 from reaperhulk/key-derivation
...
update docs for MessageEncryptor#new to recommend a KDF [ci skip]
2015-11-11 03:46:54 -02:00
Paul Kehrer
4f51433831
update docs for MessageEncryptor#new to recommend a KDF [ci skip]
2015-11-10 23:43:06 -06:00
Xavier Noria
f3516f171b
applies code style guidelines
2015-11-11 06:42:49 +01:00
Xavier Noria
40a1945d67
simplifies the implementation of #watching?
2015-11-11 06:24:34 +01:00
Xavier Noria
0eb6d198d3
simplifies directories_to_watch
2015-11-11 06:24:34 +01:00
Xavier Noria
59be32b572
registers these changes in the CHANGELOGs
2015-11-11 06:24:29 +01:00
Xavier Noria
c5846344ee
adds a comment about how does filter_out_descendants preserve order
2015-11-11 05:24:06 +01:00
Xavier Noria
0a2e9b02d6
rewrites bare loop as until
2015-11-11 05:23:29 +01:00
Xavier Noria
fe918b3bc4
simplifies the implementation of existing parent
2015-11-10 22:19:36 +01:00
Xavier Noria
4e1cff0e20
indents private methods as per our guidelines
2015-11-10 22:19:36 +01:00
Xavier Noria
bf4532dfdf
encapsulates the logic to choose the file monitor in app config
2015-11-10 22:19:35 +01:00
Xavier Noria
b7c8ce5bc2
renames the module with shared tests for file monitors
2015-11-10 22:19:35 +01:00
Xavier Noria
8793f77c4a
simplifies PathHelper with a Pathname refinement
2015-11-10 22:19:29 +01:00
Rafael França
5388464af6
Merge pull request #22216 from grosser/grosser/fast-ret
...
fast and consistent return when local_cache does not exist
2015-11-10 15:20:18 -02:00
Andrew White
6c3db3652f
Merge pull request #22244 from pacso/time-days-in-year
...
Add days_in_year method to Time class
2015-11-10 17:13:01 +00:00
Jon Pascoe
55b463f599
Add days_in_year method
2015-11-10 16:17:07 +00:00
Andrew White
320b79f54c
Merge pull request #22190 from 1st8/fix/week-field-week-number
...
Fix week_field returning invalid value
2015-11-10 12:31:27 +00:00
Christoph
60dabb156f
Fix week_field returning invalid value
...
According to the W3 spec[1] the value should use a 1-based index
and not a 0-based index for the week number.
[1]: http://www.w3.org/TR/html-markup/datatypes.html#form.data.week
2015-11-10 12:28:47 +00:00