aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-209-7/+181
|\ \ \
| * | | Add docs for ActionDispatch::Http::URL methodsclaudiob2014-12-181-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `extract_domain`, `extract_subdomains`, `extract_subdomain`. Add doc examples for `url`, `protocol`, `raw_host_with_port`, `host`, `host_with_port`, `port`, `standard_port`, `standard_port?`, `optional_port`, `port_string`. [ci skip]
| * | | Add docs for Numeric time-related methodsclaudiob2014-12-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `minutes`, `hours`, `days`, `weeks` and `fortnights`. Fix docs for `in_milliseconds`. [ci skip]
| * | | Replace `#=>` with `# =>` [ci skip]claudiob2014-12-177-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @rafaelfranca suggested in f7c7bcd9 that code examples should display the result after `# =>` and not after `#=>`. This commit replaces *all* the occurrences of `#=>` in the code documentation (mostly added by me :sob:) with the suggested `# =>`.
| * | | Add docs for Numeric#*_bytes methodsclaudiob2014-12-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `kilobytes`, `megabytes`, `gigabytes`, `terabytes`, `petabytes` and `exabytes`. Fix docs for `bytes`. [ci skip]
| * | | Add docs for Time#find_zoneclaudiob2014-12-171-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also improves docs for `Time#find_zone!` [ci skip]
| * | | Fix docs for AS::Notifications::Event#durationclaudiob2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from comments by @zzak on e07f3dd: * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015634 * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015639 [ci skip]
| * | | Add docs for AS::Notifications::Event#durationclaudiob2014-12-171-0/+12
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #18110 from claudiob/point-guide-to-masterYves Senn2014-12-201-1/+1
|\ \ \ \ | | | | | | | | | | Replace guides.ror.org/v4.2.0 with guides.ror.org
| * | | | Replace guides.ror.org/v4.2.0 with guides.ror.orgclaudiob2014-12-201-1/+1
|/ / / / | | | | | | | | | | | | | | | | No need to point links to http://guides.rubyonrails.org/v4.2.0/... now that the Ruby on Rails guides point to 4.2.0.
* | | | Merge pull request #18108 from kryzhovnik/fix_autoloading_guideAbdelkader Boudih2014-12-201-1/+1
|\ \ \ \ | | | | | | | | | | Fix link in autoloading guide
| * | | | Fix link in autoloading guideAndrey Samsonov2014-12-201-1/+1
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | activejob needs to be built before actionmailerGodfrey Chan2014-12-191-1/+1
| | | |
* | | | Merge pull request #18104 from andreynering/guides-dslXavier Noria2014-12-201-2/+3
|\ \ \ \ | | | | | | | | | | Add link for Domain-Specific Language [ci skip]
| * | | | Add link for Domain-Specific Language [ci skip]Andrey Nering2014-12-191-2/+3
| | |_|/ | |/| |
* | | | prefer single quotes, by the beard of the prophet!Xavier Noria2014-12-201-10/+10
| | | |
* | | | Merge pull request #18103 from tpope/portable-setupXavier Noria2014-12-201-7/+9
|\ \ \ \ | | | | | | | | | | Make bin/setup portable
| * | | | Make bin/setup portableTim Pope2014-12-191-7/+9
| |/ / /
* / / / Merge pull request #18102 from arthurnn/nodoc_constantArthur Nogueira Neves2014-12-192-0/+3
|/ / / | | | | | | | | | Add nodoc to some constants [skip ci]
* | | Merge pull request #18100 from chancancode/serve_static_filesGodfrey Chan2014-12-1912-18/+95
| | | | | | | | | | | | | | | | | | Allow static asset serving from env variable (enhanced!) Conflicts: railties/CHANGELOG.md
* | | last pass to the autoloading guide before release [ci skip]Xavier Noria2014-12-191-17/+44
| | |
* | | Remove rack and i18n master from bug report tempaltes [ci skip]Rafael Mendonça França2014-12-192-4/+0
| | |
* | | Use released I18n 0.7.0Carlos Antonio da Silva2014-12-191-1/+1
| | |
* | | Merge pull request #18082 from rails/17945_purge_in_test_onlyYves Senn2014-12-1911-7/+93
|\ \ \ | | | | | | | | `db:schema:load` and `db:structure:load` do not purge the database
| * | | `force: :cascade` to recreate tables referenced by foreign-keys.Yves Senn2014-12-199-5/+60
| | | |
| * | | `db:structure:load` and `db:schema:load` no longer purge the database.Yves Senn2014-12-183-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17945 `db:test:prepare` still purges the database to always keep the test database in a consistent state. This patch introduces new problems with `db:schema:load`. Prior to the introduction of foreign-keys, we could run this file against a non-empty database. Since every `create_table` containted the `force: true` option, this would recreate tables when loading the schema. However with foreign-keys in place, `force: true` wont work anymore and the task will crash. /cc @schneems
* | | | Use released rackGodfrey Chan2014-12-192-2/+2
| | | | | | | | | | | | | | | | `rack.version` was bumped in https://github.com/rack/rack/commit/28e77c710ac2ddb35c436d78d72e28f28f964446
* | | | Revert "Merge pull request #18003 from ↵Godfrey Chan2014-12-191-11/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | sikachu/permit_all_parameters-thread-safety" This reverts commit da5cc10e945552da54234f858470238a3fc36767. Fixes #18091 See also https://github.com/rails/rails/pull/18003#commitcomment-9030909
* | | Output extension is no longer generated [ci skip]Zachary Scott2014-12-181-4/+4
| | | | | | | | | | | | /cc @senny Is this change documented somewhere?
* | | Enable Travis CI container-modeRafael Mendonça França2014-12-181-3/+5
| | | | | | | | | | | | And also bundler cache
* | | Merge pull request #18077 from claudiob/add-docs-for-test-orderRafael Mendonça França2014-12-182-2/+17
|\ \ \ | | | | | | | | Add docs for AS::TestCase::test_order
| * | | Add docs for AS::TestCase::test_orderclaudiob2014-12-182-2/+17
|/ / / | | | | | | | | | | | | | | | Document `test_order` and `test_order=` from `ActiveSupport::TestCase`. [ci skip]
* | | Merge pull request #18087 from georgemillo/patch-2Eileen M. Uchitelle2014-12-181-2/+2
|\ \ \ | | | | | | | | Spelling fix [ci skip]
| * | | Spelling fix [ci skip]George Millo2014-12-181-2/+2
|/ / /
* | | passed a spell checker, not bad [ci skip]Xavier Noria2014-12-181-1/+1
| | |
* | | adds another examle to the constants not missing gotcha [ci skip]Xavier Noria2014-12-181-0/+55
|/ / | | | | | | /cc @matthewd
* | Relax the UUID regexGodfrey Chan2014-12-182-12/+9
| | | | | | | | | | | | | | | | Apparently PG does not validate against RFC 4122. The intent of the original patch is just to protect against PG errors (which potentially breaks txns, etc) because of bad user input, so we shouldn't try any harder than PG itself. Closes #17931
* | Merge pull request #18081 from yui-knk/fix/capture_helperAbdelkader Boudih2014-12-181-1/+2
|\ \ | | | | | | [ci skip] Fix HTML format on comment
| * | [ci skip] Fix HTML format on commentyui-knk2014-12-181-1/+2
|/ /
* | Fix typo in nodoc should be `:nodoc:` for RDoc to parse correctlyZachary Scott2014-12-171-1/+1
| |
* | Merge pull request #18076 from andreynering/guides-changelogZachary Scott2014-12-171-1/+1
|\ \ | | | | | | Fix name on changelog [ci skip]
| * | Fix name on changelog [ci skip]Andrey Nering2014-12-171-1/+1
|/ /
* | Merge pull request #18063 from claudiob/remove-as-time-with-zone-sinceRafael Mendonça França2014-12-171-10/+1
|\ \ | | | | | | Replace AS::TimeWithZone#since with alias to +
| * | Replace AS::TimeWithZone#since with alias to +claudiob2014-12-161-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from [Google group discussion](https://groups.google.com/forum/#!topic/rubyonrails-core/jSPbP-TNLb0). Currently `AS::TimeWithZone` has two methods to add an interval to a time: `+(other)` and `since(other)` ([docs](http://edgeapi.rubyonrails.org/classes/ActiveSupport/TimeWithZone.html)). The two methods are "pretty much" equivalent in every case: 1. When adding any interval to an `AS::TimeWithZone` representing a `Time`: ```ruby t = Time.now.in_time_zone #=> Thu, 04 Dec 2014 18:56:28 EST -05:00 t + 1 == t.since(1) #=> true t + 1.day == t.since(1.day) #=> true t + 1.month == t.since(1.month) #=> true ``` 2. When adding any interval to an `AS::TimeWithZone` representing a `Date`: ```ruby d = Date.today.in_time_zone #=> Thu, 04 Dec 2014 00:00:00 EST -05:00 d + 1 == d.since(1) #=> true d + 1.day == d.since(1.day) #=> true d + 1.month == d.since(1.month) #=> true ``` 3. When adding any interval to an `AS::TimeWithZone` representing a `DateTime`: ```ruby dt = DateTime.now.in_time_zone #=> Thu, 04 Dec 2014 18:57:28 EST -05:00 dt + 1 == dt.since(1) #=> true dt + 1.day == dt.since(1.day) #=> true dt + 1.month == dt.since(1.month) #=> false ``` As you can see, the only case in which they differ is when the interval added to a `DateTime` is in a format like `1.month`. However, this usage of "since" is explicitly discouraged by the [documentation of `DateTime#since`](https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/date_time/calculations.rb#L86L88): > Returns a new DateTime representing the time a number of seconds since the instance time. > Do not use this method in combination with x.months, use months_since instead! And indeed, following this recommendation the correct result is returned: ```ruby dt + 1.month == dt.months_since 1 #=> true ``` Therefore, my proposal is to remove the method definition of `TimeWithZone#since` and instead replace it with a simple `alias_method :since, :+`. The rationale is that the only case where they differ is a case that is explicitly discouraged as "wrong". In my opinion, having two methods named `since` and `+` and having to figure out exactly what the difference is makes the codebase more confusing. However, I understand this PR is "subjective", so if you feel like it's better to ignore this, feel free to close the PR. Thanks!
* | | Merge pull request #18072 from exAspArk/thread_safe_gem_versionRafael Mendonça França2014-12-171-1/+1
|\ \ \ | | | | | | | | | | | | Use thread_safe gem version greater or equal to 0.3.4
| * | | use thread_safe gem version greater or equal to 0.3.4Evgeny Li2014-12-171-1/+1
| | | |
* | | | simpler example for the non-missing constants gotcha [ci skip]Xavier Noria2014-12-171-42/+39
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The previous example was a little convoluted and the exposition claifying the parts that were correct albeit not totally obvious were interferring in my view. This example has less things going on and gets to the key problem with less balls in the air.
* | | Merge pull request #18068 from kamipo/remove_unused_lineCarlos Antonio da Silva2014-12-171-1/+0
|\ \ \ | | | | | | | | Remove unused line
| * | | Remove unused lineRyuta Kamizono2014-12-171-1/+0
| | | |
* | | | Merge pull request #18069 from yui-knk/fix/guideRafael Mendonça França2014-12-171-3/+3
|\ \ \ \ | |/ / / |/| | | [ci skip] Change three backticks to just one
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:05:47 +0000