Rafael Mendonça França
21fe17a067
Merge pull request #13401 from akshay-vishnoi/refactor
...
Prevent creation of instance methods when `instance_reader = false`, Grammar checks, Conditional statements combined
2013-12-19 07:39:13 -08:00
Akshay Vishnoi
d4197bc4a2
Prevent creation of instance methods when instance_reader = false
, Grammar checks, Conditional statements combined
2013-12-19 19:35:13 +05:30
Carlos Antonio da Silva
cc1f0b4c2d
Merge pull request #13395 from kuldeepaggarwal/postgres-table-ref-regex
...
modified regex for finding table_name from a multiline sql query in postgresql
2013-12-19 05:22:28 -08:00
Kuldeep Aggarwal
b082bece5e
Fix PostgreSQL insert to properly extract table name from multiline string SQL.
...
Previously, executing an insert SQL in PostgreSQL with a command like this:
insert into articles(
number)
values(
5152
)
would not work because the adapter was unable to extract the correct articles table name.
2013-12-19 18:46:17 +05:30
Ryunosuke SATO
d54bc032c9
Show routes defined under assets prefix
...
Closes #9625
2013-12-19 09:51:17 -02:00
Carlos Antonio da Silva
c5b76b5362
Prefer assert_raise instead of flunk + rescue to test for exceptions
...
Change most tests to make use of assert_raise returning the raised
exception rather than relying on a combination of flunk + rescue to
check for exception types/messages.
2013-12-19 09:20:51 -02:00
Carlos Antonio da Silva
d799b9c1cf
Fix asserting the correct exception message in dependencies test
...
In Minitest, the second argument of assert_raise(s) accepts a string as
the message that should be shown in case of a failure in the assertion
(eg nothing was raised when it should), and not the exception message to
be matched.
To do that we need to save the exception returned from assert_raise(s)
into a local variable and check for the exception message using it.
2013-12-19 08:47:09 -02:00
Jared Beck
813ab76788
Update configuring guide with I18n options regarding available locales
...
Add information about 'available_locales' and 'enforce_available_locales'
to the configuring guide.
Closes #13202 . [ci skip]
2013-12-19 08:14:51 -02:00
Carlos Antonio da Silva
5b0fc1a007
Merge pull request #13393 from matthewd/fix_pg_range_tests
...
Fix PostgreSQL range tests on fresh DB
Correcting the name of the table we're creating is self-explanatory.
But we must also move away from the low IDs, because we're not touching the freshly-created primary key sequence; when the time comes, @new_range will be assigned an ID of 1.
2013-12-19 01:44:01 -08:00
Akira Matsuda
a3ebe7f3a7
Unused classes in AMo tests
2013-12-19 18:31:11 +09:00
Akira Matsuda
4e68765cf6
Unused classes in AS tests
2013-12-19 16:30:16 +09:00
Guillermo Iguaran
86dcb55588
Merge pull request #13400 from nishant-cyro/docs
...
fix typos and grammar mistake [ci skip]
2013-12-18 22:33:49 -08:00
nishant-cyro
517caa85c9
fix typos and grammar mistake [ci skip]
2013-12-19 12:02:01 +05:30
Guillermo Iguaran
947efd4869
Merge pull request #13398 from kuldeepaggarwal/build-fixes
...
set encoding UTF-8 for accepting multibyte character
2013-12-18 22:23:22 -08:00
Guillermo Iguaran
f5a324e28c
Merge pull request #13399 from ghiculescu/patch-1
...
Fix typo: data --> date [ci-skip]
2013-12-18 22:21:15 -08:00
Alex Ghiculescu
ed768ee5c1
Fix typo: data --> date
2013-12-19 16:13:18 +10:00
Kuldeep Aggarwal
ff4673be52
set encoding UTF-8 for accepting multibyte character
2013-12-19 11:00:38 +05:30
Godfrey Chan
e63748cd37
Merge pull request #13366 from vipulnsward/minitest-namespace-change
...
Change all `MiniTest` to `Minitest`
2013-12-18 19:22:30 -08:00
Matthew Draper
f8b4110f00
Fix PostgreSQL range tests
...
The changes in c4044b2 meant the tests would error on a fresh DB.
2013-12-19 13:34:46 +10:30
Akira Matsuda
c454fc29a8
Unused classes in test case
2013-12-19 08:15:06 +09:00
Rafael Mendonça França
4779aaa1d1
Merge pull request #13386 from rono23/fix-to-param
...
Fix to_param when attribute has multibyte character
2013-12-18 12:38:29 -08:00
rono23
ee738f9604
Fix to_param when attribute has multibyte character
2013-12-19 05:29:16 +09:00
Xavier Noria
6d894cf3ea
make clear that config/secrets.yml passes through ERB and therefore supports ENV
2013-12-18 19:16:32 +01:00
Santiago Pastorino
7b5cf7ef9d
Always point to latest rbx and jruby in travis
2013-12-18 13:34:48 -02:00
Yves Senn
69b5dc7e00
document how to access mail previews. [ci skip]
...
/cc @pixeltrix
2013-12-18 14:38:02 +01:00
Jeremy Kemper
01162b3d77
Fix nil assignment to polymorphic belongs_to
...
Assigning nil to a polymorphic belongs_to would nullify its _id field by
not its _type field.
Fixes failing test from c141dfc838a5dca9f197814410fa5d44c143129c.
Regression from 1678e959e973de32287b65c52ebc6cce87148951.
2013-12-18 04:52:24 -07:00
Yves Senn
06dc51a6c0
Merge pull request #13370 from abhishekjain16/refactor_rails
...
duplication removed(DRY)
2013-12-18 03:02:24 -08:00
abhishek
21f0c580f3
duplication removed(DRY)
2013-12-18 16:17:11 +05:30
Damien Mathieu
aaea0d8813
Merge pull request #13373 from sbagdat/patch-1
...
Fix typo [ci skip]
2013-12-18 02:38:18 -08:00
Sıtkı Bağdat
0add074d37
Fix typo [ci skip]
2013-12-18 12:34:45 +02:00
Godfrey Chan
8a6d40ffc3
Added a link to the Module#concerning docs from the 4.1 release notes [ci skip]
2013-12-18 01:57:36 -08:00
Yves Senn
8ac78d81b1
Merge pull request #13367 from abhishekjain16/new_branch
...
change to DateTime.civil_from_format from DateTime.civil_from_fromat in ...
[ci skip]
2013-12-18 01:12:08 -08:00
Vipul A M
7bae2921ec
Change all MiniTest
to Minitest
since, MiniTest
namespace has been renamed to Minitest
...
Ref: https://github.com/seattlerb/minitest/blob/master/History.txt
2013-12-18 14:39:50 +05:30
abhishek
29712f0cbc
change to DateTime.civil_from_format from DateTime.civil_from_fromat in changelog [ci skip]
2013-12-18 14:21:10 +05:30
Godfrey Chan
2c9cb495f3
Merge pull request #13340 from akshay-vishnoi/typo
...
#none documentation updated [ci skip]
2013-12-18 00:02:48 -08:00
Jeremy Kemper
092e113df5
Use annotated git tags for release task
2013-12-18 01:00:13 -07:00
Yves Senn
3de199988f
we should use annotated tags for releases.
...
Annotated tags will provide us with Tagger and Time information.
2013-12-18 08:57:46 +01:00
Guillermo Iguaran
76f8d31046
Merge pull request #13363 from kuldeepaggarwal/f-video-options
...
allow video_tag to accept `size` as `Number` for square shaped videos
2013-12-17 23:42:05 -08:00
Arun Agrawal
9fb6008bfc
Merge pull request #13364 from corprew/patch-1
...
typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fromat'
2013-12-17 23:39:07 -08:00
Corprew Reed
55f7c8d971
typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fromat'
2013-12-17 23:18:14 -08:00
Kuldeep Aggarwal
cd58745a7d
allow video_tag to accept size
as Number
for square shaped videos
2013-12-18 12:24:08 +05:30
Akshay Vishnoi
db765ec741
#none documentation updated [ci skip]
2013-12-18 11:52:54 +05:30
Jeremy Kemper
c141dfc838
Add a failing test for assigning nil to a polymorphic belongs_to not nullifying its _type column
2013-12-17 21:45:55 -07:00
Carlos Antonio da Silva
b6415428c8
Merge pull request #13358 from JuanitoFatas/patch/release-notes
...
Prettify the removals from Action Controller in 4.1 release notes. [ci skip]
2013-12-17 17:26:46 -08:00
Juanito Fatas
24195d17b6
[ci skip] Prettify the removals from Action Controller in 4.1 release notes.
2013-12-18 09:15:40 +08:00
David Heinemeier Hansson
f706d5f945
Its beta1 all around
2013-12-17 16:10:57 -08:00
David Heinemeier Hansson
dc90709eaf
Fix dependency order
2013-12-17 16:10:52 -08:00
David Heinemeier Hansson
c0a2d474c5
Get ready to release 4.1.0.beta1
2013-12-17 16:05:28 -08:00
David Heinemeier Hansson
98fe2ac902
Remove the navigator for now. Its ugly and it promises more than it can deliver. These other views (properties, routes) are not designed to be loaded in isolation
2013-12-17 15:31:25 -08:00
Jeremy Kemper
4f4fdd643f
Clearly limit new CSRF protection to GET requests
2013-12-17 16:02:04 -07:00