TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
39,154 Commits 2 Branches 0 Tags 294 MiB
06344b9416
Commit Graph

39154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AJ Acevedo
06344b9416 Updated outdated initialization guide [ci skip] 2013-08-13 13:02:29 -04:00
Guillermo Iguaran
0f834868bf Merge pull request #11846 from gaurish/jdbc-upgrade 
Upgrade ActiveRecord-JDBC-Adapter to v1.3 for better compatibility with ActiveRecord 4
 2013-08-11 22:06:40 -07:00
Gaurish Sharma
53d682b132 Upgrade ActiveRecord-JDBC-Adapter to master branch 
Switch to master branch which provides Version 1.3.x of AR-JDBC adapter.
It strives to provide ActiveRecord 4.x compatibility (as well as still supporting 2.3 and 3.x) from a single code base. It's a recommended update for all AR-JDBC 1.2.x users.
 2013-08-12 09:39:46 +05:30
Akira Matsuda
2fa83ee1e4 chmod -x 2013-08-12 05:14:10 +09:00
Aaron Patterson
bbaad89ba8 only reconnect if there was already an active connection 
If you're using an in-memory database for the test database,
reconnecting will lose all information that schema:load did for us.
 2013-08-11 15:58:38 +09:00
Rafael Mendonça França
e5249a7970 Merge pull request #11826 from etipton/enable_extensions_revertible 
Make 'enable_extension' revertible
 2013-08-10 13:14:27 -07:00
Rafael Mendonça França
4f940820f2 Merge pull request #11799 from njakobsen/fix-controller-filter-callbacks 
Execute conditional procs on controller filters only for current action
 2013-08-10 10:57:35 -07:00
Nicholas Jakobsen
55cbb85fb7 Execute conditional procs on controller filters only for current action. 
:only and :except options for controller filters are now added before
:if and :unless. This prevents running :if and :unless procs when not
on the specified. Closes #11786.
 2013-08-10 09:13:20 -07:00
José Valim
a3f390b569 Merge pull request #11830 from cr0t/master 
Fixed small mistake in the engines docs
 2013-08-10 04:29:19 -07:00
Sergey Kuznetsov
9d39577bd9 Add author_name field to post_params to the engines docs 2013-08-10 14:58:24 +04:00
Eric Tipton
3a21870c6f Make 'enable_extension' revertible 
If 'enable_extension' is used in a migration's 'change' method, use
'disable_extension' on down migration (and vice-versa).
 2013-08-10 03:25:04 -04:00
Rafael Mendonça França
4f5f59a492 Merge pull request #11820 from vipulnsward/remove_s2b 
Remove redundant `string_to_binary` from type-casting
 2013-08-09 11:16:12 -07:00
Vipul A M
5ef02de131 Remove redundant string_to_binary from type-casting 2013-08-09 20:04:37 +05:30
Yves Senn
0053b2a1c4 Merge pull request #11815 from yaotti/patch-1 
Fix a broken link [ci skip]
 2013-08-08 22:21:41 -07:00
Hiroshige Umino
b83985bc6b Fix a broken link 2013-08-09 13:37:47 +09:00
Carlos Antonio da Silva
7fa93ceea8 Merge pull request #11806 from jetthoughts/change_model_term_by_simple_word 
Remove using of suffix with term. [ci skip]
 2013-08-08 04:46:06 -07:00
Paul Nikitochkin
5602eebc63 Remove using of suffix with term. [ci skip] 2013-08-08 14:04:14 +03:00
Aaron Patterson
4d8f23489e Merge pull request #11802 from ko1/fix_field_encoding_for_mysql 
Set field encoding to client_encoding for mysql adapter.
 2013-08-07 22:48:48 -07:00
Koichi Sasada
0d435cc24b Set field encoding to client_encoding for mysql adapter. 2013-08-08 14:44:39 +09:00
Yves Senn
5ac2341fab cast hstore values on write to be consistent with reading from the db. 2013-08-08 07:27:30 +02:00
Aaron Patterson
765b8aa05c Merge pull request #11331 from vipulnsward/remove_conditional 
Remove conditional, results are always an instance of `ActiveRecord::Result`
 2013-08-07 21:32:10 -07:00
Aaron Patterson
908796dac5 use skip so we can see what tests are not run 2013-08-08 13:23:10 +09:00
Yves Senn
806bc2add8 Fix multidimensional PG arrays containing non-string items 2013-08-07 20:28:14 +02:00
Steve Klabnik
4343e2dda2 Merge pull request #11789 from gaurish/multibyte_methods 
Avoid defining multibyte method names in JSON decoding test for JRuby Compatitibility
 2013-08-07 05:55:58 -07:00
Yves Senn
90e743f0fa Merge pull request #10045 from senny/document_relative_url_root 
document how to deploy to a subdirectory [ci skip]
 2013-08-07 04:40:15 -07:00
Yves Senn
b76015bfd1 document how to deploy to a subdirectory. #2992 [ci skip] 2013-08-07 13:39:25 +02:00
Gaurish Sharma
7191a5d830 Avoid defining multibyte method names in JSON decoding test for JRuby Compat 
This change is similar to #11736 & in same way switched with fixed string & the index of the hash for method name. the index was added because otherwise, ruby will raise Error.
 2013-08-07 13:19:14 +05:30
Yves Senn
da49e9a9f0 skip test_unicode_column_name for MysqlAdapter. 
This commit fixes the build but we need to further investigate the root cause,
to see if it can be fixed.

The test fails under `MysqlAdapter` with:

```
ActiveRecord::UnknownAttributeError: unknown attribute: なまえ
```

The root cause is that the returned column names from the adapter
have the wrong encoding:

```ruby
columns = Weird.columns_hash.keys
columns # => ["id", "a$b", "\xE3\x81\xAA\xE3\x81\xBE\xE3\x81\x88", "from"]
columns.map(&:encoding) # => [#<Encoding:ASCII-8BIT>, #<Encoding:ASCII-8BIT>, #<Encoding:ASCII-8BIT>, #<Encoding:ASCII-8BIT>]
columns.map {|c| c.dup.force_encoding "utf-8"} # => ["id", "a$b", "なまえ", "from"]
```

From what I can tell the MySQL variables are fine:

```
ActiveRecord::Base.connection.execute("show variables")

...
character_set_client utf8
character_set_connection utf8
character_set_database utf8
character_set_filesystem binary
character_set_results utf8
character_set_server utf8
character_set_system utf8
character_sets_dir /usr/local/Cellar/mysql/5.5.29/share/mysql/charsets/
collation_connection utf8_general_ci
collation_database utf8_unicode_ci
collation_server utf8_general_ci
...
```
 2013-08-07 08:56:05 +02:00
Xavier Noria
4a7fba09f4 RDoc tweaks 2013-08-07 06:10:18 +02:00
Carlos Antonio da Silva
174f219339 Merge pull request #11784 from davetoxa/patch-2 
Bump ruby version [ci skip]
 2013-08-06 16:01:31 -07:00
Carlos Antonio da Silva
2998421531 Merge pull request #11783 from davetoxa/patch-1 
Bump ruby version [ci skip]
 2013-08-06 16:01:12 -07:00
Anton Cherepanov
043785ac7a Bump ruby version [ci skip] 2013-08-07 03:33:56 +06:00
Anton Cherepanov
3e20ddd0d0 Bump ruby version [ci skip] 2013-08-07 03:31:33 +06:00
Yves Senn
179deea65b test to express that we can't turn non-array columns to array columns. 
Closes #11062
 2013-08-06 20:19:44 +02:00
Guillermo Iguaran
b7f2ccd77a Merge pull request #11780 from thedarkone/logger-naked-rescue-fix 
Rack::Logger naked rescue fix
 2013-08-06 08:17:08 -07:00
thedarkone
a0907bbdad "Naked" rescue clauses only catch StandardError subclasses. 
Similar to #11497.
 2013-08-06 17:04:02 +02:00
thedarkone
3af8a91c38 Add a missing require. 
This makes the rack_logger_test.rb runnable by itself (outside of the `rake test` suite).
 2013-08-06 17:03:55 +02:00
Rafael Mendonça França
48e3c462a2 Use the proper encoding comment on the file 2013-08-06 10:37:50 -03:00
Rafael Mendonça França
40cc60c270 Fix indentation 2013-08-06 09:28:45 -03:00
Aaron Patterson + Akira Matsuda
79238bad3d asakusa.rb hack night! 
Fix in-memory tests
 2013-08-06 21:26:10 +09:00
Rafael Mendonça França
4c1c2e6501 Add CHANGELOG entry for #11767 
[ci skip]
 2013-08-06 09:22:39 -03:00
Rafael Mendonça França
595b05a839 Merge pull request #11778 from jetthoughts/11759_update_assets_guides 
Update Assets Pipeline Guide [ci skip]
 2013-08-06 05:16:39 -07:00
Aaron Patterson
904bfad00d adding a weird test case 2013-08-06 20:58:27 +09:00
Paul Nikitochkin
99a9303849 #11759: Update Assets Pipeline Guide 
by default included to precompile only non-js/css files from `app/assets` and `application.(css|js)`
 2013-08-06 14:30:46 +03:00
Rafael Mendonça França
fd4e178c7e Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_words 
Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
 2013-08-05 19:03:06 -07:00
Alex Tambellini
f1d9179087 Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words 
MRI reimplemented Date in C so it doesn't hit this division anymore
while JRuby still uses the old stdlib implementation of Date so
it will always hit this.

With this change the actionview date_helper_test.rb tests should pass on JRuby.
 2013-08-05 21:52:13 -04:00
Guillermo Iguaran
ee0a8e0113 Merge pull request #11743 from gaurish/tmp-magic 
[Jruby] Make all tests in ActionView::TemplateDigestorTest green
 2013-08-05 17:04:57 -07:00
Rafael Mendonça França
b6c971e123 config[:database] should be a string 
This change was breaking the Railties tests. See
https://travis-ci.org/rails/rails/jobs/9865969
 2013-08-05 20:41:27 -03:00
Rafael Mendonça França
9281adc64a Remove deprecated branch on the scope method. 
The deprecation message was removed on 50cbc03d18c5984347965a94027879623fc44cce but the code was not.
 2013-08-05 18:27:46 -03:00
Rafael Mendonça França
d86ccec097 Use the right instrumentation name 
The pattern is event.component

Closes #11769

Conflicts:
	railties/CHANGELOG.md
 2013-08-05 18:20:22 -03:00