aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make the `static_index` config part of the `config.public_server` configYuki Nishijima2015-11-165-8/+13
| | | | Also call it `public_server.index_name` so it'll make more sense.
* Merge pull request #22112 from claudix/masterXavier Noria2015-11-131-0/+21
|\ | | | | Added warning on coding engine controllers [ci skip]
| * Improved explanationClaudi Martinez2015-11-131-4/+1
| |
| * Improved explanationClaudi Martinez2015-11-011-10/+16
| |
| * Fixed typoClaudi Martinez2015-10-291-1/+1
| |
| * Added warning on coding engine controllersClaudi Martinez2015-10-291-0/+18
| |
* | Merge pull request #22280 from yui-knk/fix_chagnelog_actionviewRichard Schneeman2015-11-121-1/+1
|\ \ | | | | | | [ci skip] Fix CHANGELOG.md format from list to italic.
| * | [ci skip] Fix CHANGELOG.md format from list to italic.yui-knk2015-11-131-1/+1
| | |
* | | Merge pull request #22279 from yui-knk/fix_object_partial_falseRichard Schneeman2015-11-124-1/+10
|\ \ \ | |/ / |/| | Respect value of `:object` if `:object` is false when rendering
| * | Respect value of `:object` if `:object` is false when renderingyui-knk2015-11-134-1/+10
|/ / | | | | | | | | This commit fixes the bug convering `false` to `locals[as]` when `options[:object]` is `false` (close #22260).
* | Prefer Minitest's location for test failures.Kasper Timm Hansen2015-11-122-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ........ ```
* | Don't match specific line numbers in reporter tests.Kasper Timm Hansen2015-11-121-4/+4
| | | | | | | | The overall syntax of the file path is more important, not the exact line it was on.
* | Ignore Gemfile.lock in the release taskRafael Mendonça França2015-11-121-1/+1
| |
* | Merge pull request #22277 from jwworth/pull-request/fix-typo-1447344392Rafael França2015-11-121-1/+1
|\ \ | | | | | | Fix typo [ci skip]
| * | Fix typo [ci skip]Jake Worth2015-11-121-1/+1
| | |
* | | Merge pull request #22259 from daisuko/remove_compiled_root_from_static_rbYves Senn2015-11-121-1/+0
|\ \ \ | |/ / |/| | remove unnecessary @compiled_root from static.rb
| * | remove unnecessary @compiled_root from static.rbdaisuko2015-11-111-1/+0
| | |
* | | Merge pull request #21601 from yui-knk/fix/ar_tables_without_view2Yves Senn2015-11-1224-98/+208
|\ \ \ | | | | | | | | All `AR::ConnectionAdapters#tables` return only tables(exclude views)
| * | | Deprecate `#table_exists?`, `#tables` and passing arguments to `#talbes`yui-knk2015-11-0924-98/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on #21509, how views is treated by `#tables` are differ by each adapters. To fix this different behavior, after Rails 5.0 is released, deprecate `#tables`. And `#table_exists?` would check both tables and views. To make their behavior consistent with `#tables`, after Rails 5.0 is released, deprecate `#table_exists?`.
* | | | Merge pull request #22273 from ↵Kasper Timm Hansen2015-11-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | JuanitoFatas/patch/fix-a-warning-in-active-support-test-suite Fix instance variable not defined warning from Active Support test suite
| * | | | Fix instance variable not defined warning from Active Support test suiteJuanitoFatas2015-11-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before ./Users/Juan/dev/rails/activesupport/test/file_update_checker_shared_tests.rb:20: warning: instance variable @tmpdir not initialized After No warnings
* | | | base (refined) Pathname#ascendant_of? also on Pathname#ascendXavier Noria2015-11-121-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #22269 from dharamgollapudi/patch-1Xavier Noria2015-11-111-1/+1
|\ \ \ \ | | | | | | | | | | Use the file watcher defined by the app config
| * | | | Use the file watcher defined by the app configDharam Gollapudi2015-11-111-1/+1
|/ / / / | | | | | | | | This can make use of the FileEventedUpdateChecker, if available.
* | | | let filter_out_descendants do less passesXavier Noria2015-11-111-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #22264 from rails/fix-21230Rafael França2015-11-111-1/+5
|\ \ \ \ | | | | | | | | | | Show middleware classes on /rails/info/properties
| * | | | Show middleware classes on /rails/info/propertiesclaudiob2015-11-111-1/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #22258 from rymai/patch-1Claudio B2015-11-111-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix typo: "in" should be "is"
| * | | Fix typo: "in" should be "is"Rémy Coutable2015-11-111-1/+1
| | | |
* | | | revises the implementation of Pathname#ascendant_of? (in refinement)Xavier Noria2015-11-112-1/+37
|/ / /
* | | normalizes spacing in a CHANGELOG [ci skip]Xavier Noria2015-11-111-6/+6
| | |
* | | Merge branch 'fxn-master'Xavier Noria2015-11-1113-105/+581
|\ \ \
| * | | update docs for MessageEncryptor#new to recommend a KDF [ci skip]Paul Kehrer2015-11-111-2/+2
| | | |
| * | | Add days_in_year methodJon Pascoe2015-11-113-3/+33
| | | |
| * | | Fix week_field returning invalid valueChristoph2015-11-113-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Minor fix in Module#mattr_reader documentationYuri Kasperovich2015-11-111-1/+1
| | | |
| * | | Clarify i18n active[model/record] key differencesJames Coleman2015-11-111-0/+2
| | | | | | | | | | | | | | | | 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.
| * | | fast and consistent return when local_cache does not existMichael Grosser2015-11-111-9/+12
| | | |
| * | | modernizes the test definitions in the file monitors suiteXavier Noria2015-11-111-16/+17
| | | |
| * | | applies code style guidelinesXavier Noria2015-11-115-14/+14
| | | |
| * | | simplifies the implementation of #watching?Xavier Noria2015-11-111-16/+12
| | | |
| * | | simplifies directories_to_watchXavier Noria2015-11-111-7/+4
| | | |
| * | | registers these changes in the CHANGELOGsXavier Noria2015-11-112-0/+16
| | | |
| * | | adds a comment about how does filter_out_descendants preserve orderXavier Noria2015-11-111-0/+1
| | | |
| * | | rewrites bare loop as untilXavier Noria2015-11-111-3/+1
| | | |
| * | | simplifies the implementation of existing parentXavier Noria2015-11-101-13/+2
| | | |
| * | | indents private methods as per our guidelinesXavier Noria2015-11-101-28/+28
| | | |
| * | | encapsulates the logic to choose the file monitor in app configXavier Noria2015-11-101-1/+9
| | | |
| * | | renames the module with shared tests for file monitorsXavier Noria2015-11-103-5/+5
| | | |
| * | | simplifies PathHelper with a Pathname refinementXavier Noria2015-11-101-22/+22
| | | |