Naoto Takai
80a2c9e5db
Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer
2012-05-17 06:55:41 +09:00
Aaron Patterson
78b6fdd89f
Merge pull request #6337 from bcardarella/patch-1
...
Changing the indentation level of the block comment close for Sass
2012-05-16 14:39:46 -07:00
Aaron Patterson
d6e4c06a8a
assuming there is only one column, we can simplify the type cast loop
2012-05-16 14:16:57 -07:00
Aaron Patterson
2a38fd58a9
MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless
...
an alias is provided. Without the alias, the column cannot be found
and properly typecast.
2012-05-16 14:07:10 -07:00
Vijay Dev
bf0212b92a
remove stray text in getting started guide [ci skip]
2012-05-17 01:48:47 +05:30
Carlos Galdino + Rafael Mendonça França
eb06d582e4
Revert "Merge pull request #6354 from lest/patch-1"
...
This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing
changes made to 9adf28c026070afb78b80027521a4ddddd68d697.
Reason: This broke the actionmailer tests
2012-05-16 17:10:17 -03:00
Vijay Dev
98bfccbdb5
document the AR::Base#ids method introduced in 9307616 [ci skip]
2012-05-17 01:34:00 +05:30
Rafael Mendonça França
e8feaff60b
Merge pull request #6354 from lest/patch-1
...
remove unnecessary require
2012-05-16 12:51:16 -07:00
Vijay Dev
9adf28c026
fix bad formatting [ci skip]
2012-05-17 01:13:19 +05:30
Sergey Nartimov
f88f699a7b
remove unnecessary require
...
- access & filters don't use multibyte ext
- transliterate requires only AS::Multibyte but not multibyte ext
2012-05-16 22:39:56 +03:00
Aaron Patterson
2a67a8cc59
Merge pull request #6136 from mhfs/sqlbypass_fixes
...
Bring SqlByPassTest to light and fix broken tests
2012-05-16 11:27:24 -07:00
Aaron Patterson
4025efb53b
Merge pull request #6349 from erichmenge/patch-raise-type-errors
...
Integer limit out of range should be allowed to raise. Closes #6272
2012-05-16 11:25:43 -07:00
Aaron Patterson
2ee8ed4e71
Merge pull request #6353 from nashby/safe-interpolation
...
fix safe string interpolation with SafeBuffer#%
2012-05-16 11:17:42 -07:00
Carlos Antonio da Silva
aa964204b8
Merge pull request #6336 from erichmenge/patch-pluck-fragment
...
Fixes issue where SQL fragments prevented type casting based on column
2012-05-16 11:17:04 -07:00
Vasiliy Ermolovich
9fb21e98e2
fix safe string interpolation with SafeBuffer#%, closes #6352
2012-05-16 21:05:26 +03:00
Erich Menge
c90f16da62
Fixes issue where SQL fragments prevented type casting based on column type.
2012-05-16 12:02:02 -05:00
Vijay Dev
e29626901a
remove image_tag onmouseover option docs [ci skip]
2012-05-16 21:17:25 +05:30
Erich Menge
56cef492c6
Integer limit out of range should be allowed to raise. Closes #6272
2012-05-16 07:46:01 -05:00
Piotr Sarnacki
4edb497676
Remove unneeded tests
2012-05-16 00:40:46 -07:00
Vijay Dev
80ba7a8bac
Merge pull request #6347 from avakhov/ar-changelog-misprint
...
Fix misprint in AR changelog
2012-05-15 23:56:23 -07:00
Piotr Sarnacki
f3482a9fb1
Fix tests in railties
...
Since `bundle install` was fixed in `rails plugin new`, it
now requires `rails 4.0.0.beta` version in filesystem when
running tests. Instead of providing it, we can run tested
command with `--dev` option, to use rails from the local
directory.
2012-05-15 22:48:05 -07:00
Michal Papis
5904295b23
improve #6318
2012-05-15 22:31:08 -07:00
Piotr Sarnacki
57d534ee9e
Merge pull request #6344 from erichmenge/patch_sqlite_time_type
...
SQLite3 doesn't actually support the 'time' type.
2012-05-15 22:14:54 -07:00
Alexey Vakhov
2baa8ba953
Fix misprint in AR changelog
2012-05-16 09:06:57 +04:00
Piotr Sarnacki
20f049fb50
Merge pull request #6346 from oscardelben/patch-9
...
Remove useless check of adapter
2012-05-15 21:59:00 -07:00
Oscar Del Ben
e8b809070d
Remove useless check of adapter
2012-05-15 20:48:51 -07:00
Rafael Mendonça França
379b1107d3
Merge pull request #6343 from oscardelben/bump_sqlite3
...
Bump sqlite3 gem
2012-05-15 20:28:47 -07:00
Marcelo Silveira
279fef1f9f
Rename test file so that the test suite matches it, implement persisted?
for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
2012-05-16 00:28:03 -03:00
Oscar Del Ben
2fac9156bf
Bumo sqlite3 gem
2012-05-15 20:25:30 -07:00
Erich Menge
d9fc180fb4
SQLite3 doesn't actually support the 'time' type.
2012-05-15 22:05:00 -05:00
Brian Cardarella
ef703b537b
Changing the indentation level of the block comment close for SASS
...
If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
2012-05-15 22:57:14 -03:00
Rafael Mendonça França
7994496ab4
Merge pull request #6273 from KensoDev/feature/simple_format_refactoring
...
Feature/simple format refactoring
2012-05-15 15:58:11 -07:00
Rafael Mendonça França
dafc734309
Merge pull request #6333 from carlosgaldino/unnecessary-call
...
Remove unnecessary calls to primary_key on sqlite3_adapter
2012-05-15 15:28:46 -07:00
Carlos Galdino
6c79e82002
Remove unnecessary calls to primary_key on sqlite3_adapter
2012-05-15 19:25:15 -03:00
Carlos Antonio da Silva
6f226e0160
Merge pull request #6325 from kennyj/fix_5832-3
...
Remove unnecessary assertions.
2012-05-15 14:16:51 -07:00
Carlos Antonio da Silva
bc4ebaf269
Merge pull request #6327 from nashby/string-interpolation
...
remove backported string interpolation
2012-05-15 12:01:47 -07:00
Vasiliy Ermolovich
80b681686a
remove backported string interpolation
2012-05-15 20:53:28 +03:00
Jeremy Kemper
ea50d53da1
Expand and improve #pluck docs
2012-05-15 10:29:09 -07:00
Jeremy Kemper
3f352d0405
Restore support for Model.pluck('sql fragment')
2012-05-15 10:29:09 -07:00
Carlos Antonio da Silva
9b4f5041d2
Kill whitespaces ✂️
2012-05-15 13:38:29 -03:00
kennyj
53debf1456
Remove unnecessary assertions. We should only test the before_seq isn't same to the after_seq when using sequencer.
2012-05-16 01:33:52 +09:00
Rafael Mendonça França
2649fba09d
Merge pull request #6322 from acapilleri/some_mispelling_errors
...
corrected some misspelling
2012-05-15 09:33:26 -07:00
Angelo capilleri
0bbcc91b8c
corrected some misspelling
2012-05-15 18:01:40 +02:00
Aaron Patterson
1c3e5bee3d
Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master
...
[#5559 ] Do not black out the system timezone DST jump hour if Time.zone ...
2012-05-15 08:24:25 -07:00
Carlos Antonio da Silva
e3cc49cff7
Remove extra end
in arel_table docs. [ci skip]
...
Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4
2012-05-15 10:00:59 -03:00
Carlos Antonio da Silva
3d1b078a5b
Merge pull request #6284 from acapilleri/dup_validation
...
clean the erros if an object that includes validation is duped.
2012-05-15 05:20:57 -07:00
José Valim
dd42e89058
Revert "Revert "Remove :disable_with
in favor of 'data-disable-with'
option from submit_tag
, button_tag
and button_to
helpers.""
...
Finally remove `:disable_with` but use `:data => { :disable_with => ... }`
in examples to show off a better API (which looks nicer in Ruby 1.9)
This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.
2012-05-15 10:08:51 +02:00
José Valim
a5c38a9c08
Revert "Remove :disable_with
in favor of 'data-disable-with'
option from submit_tag
, button_tag
and button_to
helpers."
...
`disable_with:` is much easier to type than `"data-disable-with" =>`,
and the fact it uses "data-disable-with" => is an implementation concern,
it should not affect the public API.
This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.
2012-05-15 09:55:30 +02:00
Vijay Dev
59b03d418f
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
2012-05-15 13:13:55 +05:30
Vijay Dev
7cd8884093
missing dot [ci skip]
2012-05-15 13:10:08 +05:30