aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #11826 from etipton/enable_extensions_revertibleRafael Mendonça França2013-08-103-1/+16
|\ \ \ \ | | | | | | | | | | Make 'enable_extension' revertible
| * | | | Make 'enable_extension' revertibleEric Tipton2013-08-103-1/+16
| |/ / / | | | | | | | | | | | | | | | | If 'enable_extension' is used in a migration's 'change' method, use 'disable_extension' on down migration (and vice-versa).
* | | | Merge pull request #11799 from njakobsen/fix-controller-filter-callbacksRafael Mendonça França2013-08-103-1/+17
|\ \ \ \ | | | | | | | | | | Execute conditional procs on controller filters only for current action
| * | | | Execute conditional procs on controller filters only for current action.Nicholas Jakobsen2013-08-103-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :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.
* | | | | Merge pull request #11830 from cr0t/masterJosé Valim2013-08-101-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed small mistake in the engines docs
| * | | | Add author_name field to post_params to the engines docsSergey Kuznetsov2013-08-101-0/+8
|/ / / /
* | | | Merge pull request #11820 from vipulnsward/remove_s2bRafael Mendonça França2013-08-096-37/+4
|\ \ \ \ | | | | | | | | | | Remove redundant `string_to_binary` from type-casting
| * | | | Remove redundant `string_to_binary` from type-castingVipul A M2013-08-096-37/+4
|/ / / /
* | | | Merge pull request #11815 from yaotti/patch-1Yves Senn2013-08-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix a broken link [ci skip]
| * | | | Fix a broken linkHiroshige Umino2013-08-091-1/+1
|/ / / /
* | | | Merge pull request #11806 from jetthoughts/change_model_term_by_simple_wordCarlos Antonio da Silva2013-08-081-1/+1
|\ \ \ \ | | | | | | | | | | Remove using of suffix with term. [ci skip]
| * | | | Remove using of suffix with term. [ci skip]Paul Nikitochkin2013-08-081-1/+1
|/ / / /
* | | | Merge pull request #11802 from ko1/fix_field_encoding_for_mysqlAaron Patterson2013-08-074-3/+14
|\ \ \ \ | | | | | | | | | | Set field encoding to client_encoding for mysql adapter.
| * | | | Set field encoding to client_encoding for mysql adapter.Koichi Sasada2013-08-084-3/+14
| | | | |
* | | | | cast hstore values on write to be consistent with reading from the db.Yves Senn2013-08-084-4/+34
|/ / / /
* | | | Merge pull request #11331 from vipulnsward/remove_conditionalAaron Patterson2013-08-071-8/+1
|\ \ \ \ | | | | | | | | | | Remove conditional, results are always an instance of `ActiveRecord::Result`
| * | | | Remove conditional, since results are always an instance of ↵Vipul A M2013-07-061-8/+1
| | | | | | | | | | | | | | | | | | | | `ActiveRecord::Result`
* | | | | use `skip` so we can see what tests are not runAaron Patterson2013-08-081-6/+5
| |/ / / |/| | |
* | | | Fix multidimensional PG arrays containing non-string itemsYves Senn2013-08-073-15/+32
| | | |
* | | | Merge pull request #11789 from gaurish/multibyte_methodsSteve Klabnik2013-08-071-3/+4
|\ \ \ \ | | | | | | | | | | Avoid defining multibyte method names in JSON decoding test for JRuby Compatitibility
| * | | | Avoid defining multibyte method names in JSON decoding test for JRuby CompatGaurish Sharma2013-08-071-3/+4
| | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #10045 from senny/document_relative_url_rootYves Senn2013-08-071-2/+39
|\ \ \ \ \ | |/ / / / |/| | | | document how to deploy to a subdirectory [ci skip]
| * | | | document how to deploy to a subdirectory. #2992 [ci skip]Yves Senn2013-08-071-2/+39
| | | | |
* | | | | skip `test_unicode_column_name` for `MysqlAdapter`.Yves Senn2013-08-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ... ```
* | | | | RDoc tweaksXavier Noria2013-08-071-5/+10
| | | | |
* | | | | Merge pull request #11784 from davetoxa/patch-2Carlos Antonio da Silva2013-08-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bump ruby version [ci skip]
| * | | | | Bump ruby version [ci skip]Anton Cherepanov2013-08-071-1/+1
| | | | | |
* | | | | | Merge pull request #11783 from davetoxa/patch-1Carlos Antonio da Silva2013-08-061-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Bump ruby version [ci skip]
| * | | | | Bump ruby version [ci skip]Anton Cherepanov2013-08-071-3/+3
|/ / / / /
* | | | | test to express that we can't turn non-array columns to array columns.Yves Senn2013-08-061-0/+9
| | | | | | | | | | | | | | | | | | | | Closes #11062
* | | | | Merge pull request #11780 from thedarkone/logger-naked-rescue-fixGuillermo Iguaran2013-08-062-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Rack::Logger naked rescue fix
| * | | | | "Naked" rescue clauses only catch StandardError subclasses.thedarkone2013-08-062-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Similar to #11497.
| * | | | | Add a missing require.thedarkone2013-08-061-0/+1
|/ / / / / | | | | | | | | | | | | | | | This makes the rack_logger_test.rb runnable by itself (outside of the `rake test` suite).
* | | | | Use the proper encoding comment on the fileRafael Mendonça França2013-08-061-0/+2
| | | | |
* | | | | Fix indentationRafael Mendonça França2013-08-061-3/+2
| | | | |
* | | | | asakusa.rb hack night!Aaron Patterson + Akira Matsuda2013-08-062-0/+5
| | | | | | | | | | | | | | | | | | | | Fix in-memory tests
* | | | | Add CHANGELOG entry for #11767Rafael Mendonça França2013-08-061-0/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #11778 from jetthoughts/11759_update_assets_guidesRafael Mendonça França2013-08-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update Assets Pipeline Guide [ci skip]
| * | | | | #11759: Update Assets Pipeline GuidePaul Nikitochkin2013-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | by default included to precompile only non-js/css files from `app/assets` and `application.(css|js)`
* | | | | | adding a weird test caseAaron Patterson2013-08-062-0/+8
|/ / / / /
* | | | | Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_wordsRafael Mendonça França2013-08-051-5/+7
|\ \ \ \ \ | | | | | | | | | | | | Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
| * | | | | Remove privatizing of Fixnum#/ from assert_distance_of_time_in_wordsAlex Tambellini2013-08-051-5/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #11743 from gaurish/tmp-magicGuillermo Iguaran2013-08-051-0/+0
|\ \ \ \ \ | | | | | | | | | | | | [Jruby] Make all tests in ActionView::TemplateDigestorTest green
| * | | | | Add tmp dir in actionview/test/Gaurish Sharma2013-08-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing tmp directory will cause the test to fail on JRuby. will commit adds tmp directory & 22 TemplateDigestorTests which were failing before are now green. Further Discussion on this can be seen at #11743
* | | | | | config[:database] should be a stringRafael Mendonça França2013-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was breaking the Railties tests. See https://travis-ci.org/rails/rails/jobs/9865969
* | | | | | Remove deprecated branch on the scope method.Rafael Mendonça França2013-08-051-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | The deprecation message was removed on 50cbc03d18c5984347965a94027879623fc44cce but the code was not.
* | | | | | Use the right instrumentation nameRafael Mendonça França2013-08-053-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern is event.component Closes #11769 Conflicts: railties/CHANGELOG.md
* | | | | | Merge pull request #11767 from kassio/master-load-fixtures-from-linked-folderRafael Mendonça França2013-08-055-4/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Load fixtures from linked folders[master]
| * | | | | | load fixtures from linked foldersKassio Borges2013-08-055-4/+17
| | | | | | |
* | | | | | | Merge pull request #11666 from prathamesh-sonpatki/doc-fixXavier Noria2013-08-051-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed confusing statement about adding route for show action in getting started guide [ci skip]