Commit Graph

51057 Commits

Author SHA1 Message Date
Arthur Nogueira Neves
0cb047aa9e Merge pull request #19899 from tgxworld/fix_doc
No need to capitalize verbs. [CI SKIP]
2015-04-25 12:41:15 -04:00
Guo Xiang Tan
14d7e058a0 No need to capitalize verbs. [CI SKIP] 2015-04-26 00:18:56 +08:00
Robin Dupret
e61f4ea313 Minor edits to the "Action View Overview" guide
Follow-up to #19672 and 8b0aa0c1.

[ci skip]
2015-04-25 13:53:17 +02:00
Akira Matsuda
2fab16142e 🚮 Unused methods 2015-04-25 17:09:33 +09:00
Akira Matsuda
6a4771fd6e 🚮 Unused method
This method is not in use since 479c7cacd5db58ab7200bc1de58c829a1a643278
2015-04-25 17:09:33 +09:00
Akira Matsuda
9b3fa766d4 Why do we add a top-level constant here? 2015-04-25 17:07:54 +09:00
Akira Matsuda
9b36cf0fa4 Do not show --helper and --assets options in the controller generator help
These options are not actually available.
Thanks @soutaro for letting me aware of this.
2015-04-25 17:07:54 +09:00
Zachary Scott
5d6b54339b Merge pull request #19894 from thenickcox/deprecated_proxy_docs
[ci skip] Rework docs, add examples on deprecation proxies
2015-04-24 21:14:55 -04:00
Nick Cox
ea30e32998 [ci skip] Rework docs, add examples on deprecation proxies 2015-04-24 14:41:03 -07:00
Yves Senn
dc6984448b Merge pull request #19236 from sshaw/more_tagged_logging_docs
More docs on tagged logging [ci skip]
2015-04-24 22:10:46 +02:00
Claudio B.
ab10f6ef22 Merge pull request #19888 from imtayadeway/tw/attribute-methods-docs
Fix grammar/style in attribute methods docs
2015-04-24 11:54:54 -07:00
Skye Shaw
c744af7cd3 Refer to the constructer argument in docs 2015-04-24 13:00:56 -04:00
Derek Prior
6ad5e7ebeb
Correct translate helper docs [ci skip]
The documentation previously stated that calling `translate(".foo")` was
equivalent to calling `I18n.translate("people.index.foo")` which is
incorrect due to the various other functions of the `translate` view
helper. This has been fixed.

Additionally, a note about forcing the view helper to re-raise
exceptions was added to the section detailing the handling of missing
translations.

Other cleanup includes:

* Consistent formatting of code
* Stop indenting bulleted list as a code sample
* Tighten some of the language
* Wrap at 80 characters.
2015-04-24 11:45:35 -04:00
Mike Stone
8cbeec773f image_tag raises an error if size is passed with height and/or width 2015-04-24 11:26:49 -04:00
Tim Wade
f207d948c8
Fix grammar/style: assigns/declares -> assignments/declarations.
[ci skip]
2015-04-24 09:02:38 -04:00
Tim Wade
ed6de3afcc
Fix grammar/style: use (v) fall back (on).
[ci skip]
2015-04-24 08:52:51 -04:00
Tim Wade
37349f71ad
Fix grammar/style: break up long sentence.
A conjunction was needed to make these sentences correct. Breaking them
up seemed like a better option.

[ci skip]
2015-04-24 08:40:41 -04:00
Tim Wade
875f675284
Fix grammar/style: pluralize 'each of its method'
[ci skip]
2015-04-24 08:32:58 -04:00
Yves Senn
b29d794b8c use a more descriptive example. [ci skip]
follow up to 107526e809ea2b6de8b2775ecf83e55d60833206
2015-04-24 14:02:26 +02:00
Yves Senn
107526e809 docs for create_table and non-int primary keys. [ci skip] 2015-04-24 13:58:07 +02:00
Godfrey Chan
78b51a8071 Uncomment byebug in framework Gemfile
History:

1. `debugger` was there until d2ed433b where it was commented out, and I
   couldn't figure out why

2. Since then we inherited that when switching to `byebug` in 93559da4

Reasons:

1. It's nice to have a debugger when working on framework bugs

2. It's an uncommented dependency in app Gemfiles since Rails 4.2 (see fbe38c9e)
2015-04-24 01:24:50 -04:00
Rafael Mendonça França
55d9e494e8 Merge pull request #19881 from sikachu/silence-mysql-errno-warning
Silence warning from MySQL::Error object in test
2015-04-23 18:13:18 -03:00
Prem Sichanugrist
150f40998d Silence warning from MySQL::Error object in test
When running Active Record MySQL test, this warning is printed in the
console:

    warning: instance variable errno not initialized

It turns out that this is a warning from `mysql` gem in MySQL::Error
object. However, since the `mysql` gem is no longer maintained, and
there won't be a newer version, it make sense for us to just silence
this warning to make the output cleaner.
2015-04-23 17:05:03 -04:00
Rafael Mendonça França
03e987cd8f Merge pull request #19879 from bboe/RedirectTestCleanup
Remove unused WorkshopsController class in redirect_test.
2015-04-23 17:25:34 -03:00
Bryce Boe
0eaae0291b Remove unused WorkshopsController class in redirect_test. 2015-04-23 16:12:01 -04:00
Rafael Mendonça França
f5ae2894c3 Remove nonexistent adapter
Closes #19866

[ci skip]
2015-04-23 15:45:21 -03:00
Rafael Mendonça França
4128e70791 Add nodoc to some private constants [ci skip] 2015-04-23 14:57:30 -03:00
Rafael Mendonça França
d949460f9b Merge pull request #19823 from sbhatore/doc_fix_1
[ci skip] Description inside Signed and Encrypted CookieJars added
2015-04-23 14:40:40 -03:00
Siddharth Bhatore
f92f5b706b Squashed commit of the following:
commit a88875ac6abaa4d8116b42af8cd71189ce3d44d3
Author: Siddharth Bhatore <sbhatore95@gmail.com>
Date:   Thu Apr 23 12:26:08 2015 +0530

    [ci skip] Update doc fix cookies

commit f175eaa7a21db898fc6c66334f770831028f9d00
Author: Siddharth Bhatore <sbhatore95@gmail.com>
Date:   Mon Apr 20 12:58:04 2015 +0530

    Description inside Signed and Encrypted CookieJars added
2015-04-23 22:56:56 +05:30
Rafael Mendonça França
6f37d7e117 Merge pull request #18880 from mudge/timestamp-index-bug
Fix missing index when using timestamps with index
2015-04-23 13:51:55 -03:00
Rafael Mendonça França
0df2f7faef Merge pull request #19875 from cllns/fix-css-formatting-in-welcome-index
Fix CSS formatting in welcome#index.html.erb
2015-04-23 13:34:13 -03:00
Sean Collins
46f5114405 Fix CSS formatting in welcome#index.html.erb 2015-04-23 12:27:14 -04:00
Yves Senn
805bfc9886 Merge pull request #19872 from Ecco/master
Fix a minor grammatical issue in the doc [ci skip]
2015-04-23 15:43:20 +02:00
Richard Schneeman
8dd0bdf1c1 Merge pull request #19870 from thenickcox/action_dispatch_mw_docs
[ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware
2015-04-23 09:35:07 -04:00
Romain Goyet
8e103d1824 Fix a minor grammatical issue in the doc 2015-04-23 12:43:46 +02:00
Nick Cox
4c4fa41b37 [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware 2015-04-22 21:06:08 -07:00
Matthew Draper
40ff5087ec Queue Classic runs a second earlier than scheduled
That seems to be a bug, but as we don't actually care about the
precision for our test, we'll just give it a bit longer.

[Matthew Draper & Cristian Bica]
2015-04-23 05:36:58 +09:30
Rafael Mendonça França
8d901b905c Require yaml before trying to rescue its exception class 2015-04-22 15:11:21 -04:00
Andrew White
688c0ec264 Remove sqlite support from rails dbconsole
Support for versions of SQLite less than 3 was removed in #6011 as part
of the Rails 4.0 release. Therefore there is no need to have support for
it in the `rails dbconsole` command anymore.
2015-04-22 14:47:13 -04:00
Rafael Mendonça França
7196372a8e Merge pull request #19862 from piton4eg/patch-2
Fix find_each options [ci skip]
2015-04-22 15:40:02 -03:00
Alexey Markov
bd41f68f40 Fix find_each options [ci skip] 2015-04-22 21:37:38 +03:00
Rafael Mendonça França
d0ec2a9856 Don't ask something that we don't want to
We only want to support adapters that we officially support through the
entire framework so it is better to not ask patches for adapters that
we may not support
2015-04-22 15:11:27 -03:00
Andrew White
3ab66a0ce4 Merge pull request #17333 from rails/encode-twz-tzinfo-in-yaml
Improve ActiveSupport::TimeWithZone conversion to YAML
2015-04-22 13:39:02 -04:00
Rafael Mendonça França
68a033ea5f Merge pull request #19858 from cllns/fix-scaffolding-css-formatting
Fix formatting of scaffold css
2015-04-22 13:44:20 -03:00
Sean Collins
f90e1bc215 Fix formatting of scaffold css 2015-04-22 12:40:06 -04:00
Rafael Mendonça França
eb9e863648 Merge pull request #19857 from sikachu/remove-alias-method-chain-doc
Clearify that alias_method_chain is deprecated
2015-04-22 13:20:42 -03:00
Andrew White
3aa26cfb19 Improve ActiveSupport::TimeWithZone conversion to YAML
Previously when converting AS::TimeWithZone to YAML it would be output
as a UTC timestamp. Whilst this preserves the time information accurately
it loses the timezone information. This commit changes that so that it is
saved along with the time information. It also provides nicer encoding of
AS::TimeZone instances themselves which previously embedded all of the
data from the TZInfo records.

Fixes #9183.
2015-04-22 12:12:39 -04:00
Andrew White
5302d244eb Refactor ActiveSupport::Timezone#strptime
Make strptime behave more like parse when components are missing and
share behavior between the two methods.
2015-04-22 12:05:07 -04:00
Paul A Jungwirth
a5e507fa0b Add ActiveSupport::TimeZone#strptime.
This makes it easier to parse user-inputted times as from a given time zone.
2015-04-22 12:05:07 -04:00
Prem Sichanugrist
5bc7736806 Clearify that alias_method_chain is deprecated
This was not clear on the API documentation that the method was
deprecated in a982a42d766169c2170d7f100c2a5ceb5430efb1.
2015-04-22 12:03:34 -04:00