aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #25678 from voxik/DRY-downloaderRafael França2016-07-044-65/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Dry downloader
| * | | | | | | Skip the test if test data download fails.Vít Ondruch2016-07-044-12/+16
| | | | | | | |
| * | | | | | | DRY Downloader.Vít Ondruch2016-07-044-53/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #25679 from voxik/file-fixtures-test-require-pathnameSantiago Pastorino2016-07-041-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Pathname might not be always initialized.
| * | | | | | Pathname might not be always initialized.Vít Ondruch2016-07-041-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Require 'pathname' explicitly
* | | | | | Merge pull request #25680 from ↵Rafael França2016-07-041-7/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | HermanHiddema/fix/unnecessary-nesting-in-handle-dependency Fixed unnecessary nesting in handle_dependency
| * | | | | | Fixed unnecessary nesting in handle_dependencyHerman Hiddema2016-07-041-7/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This nested if checked the same value as the containing case statement. Moved the code in the if/else into when/else in the containing case.
* | | | | | Tiny documentation fixes [ci skip]Robin Dupret2016-07-041-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a link to use RDoc syntax and make sure that the titles' level match the section we are in since we are both documenting the new and the legacy syntax.
* | | | | | Merge pull request #25684 from kivanio/masterप्रथमेश Sonpatki2016-07-041-7/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix respond_to? documentation [ci skip]
| * | | | | fix respond_to? documentationKivanio Barbosa2016-07-041-7/+7
|/ / / / /
* | | | | Merge pull request #25663 from vipulnsward/updated-syntax-highlighterXavier Noria2016-07-0445-5235/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | | Update Syntax Highlighter to version 4 [ci skip]
| * | | | - Update Syntax Highlighter to version 4.Vipul A M2016-07-0345-5235/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Build Syntax Highlighter based on https://github.com/syntaxhighlighter/syntaxhighlighter/wiki/Building and use theme generated by fxn. - This also bundles these brushes in the file itself- ruby,css,xml,sql,javascript,plain. Generation command used: gulp build --compat --brushes=javascript,ruby,xml,sql,plain --theme=/Path/To/RailsSource/rails/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css - rm all old js and css files - Moved over how JS configuration is created for Syntax Highlighter - Fixed layout for all imports - Fixes bug with old copy paste, generating wrong space character on webkit https://github.com/syntaxhighlighter/syntaxhighlighter/blob/7caa9632e7fe470d944fc06b4db7d35352ebaa36/src/dom.js#L227 Fixes #25655
* | | | Merge pull request #24988 from mwear/action_cable_broadcast_notificationsMatthew Draper2016-07-043-6/+58
|\ \ \ \ | | | | | | | | | | Add ActiveSupport::Notifications hook to ActionCable::Server.broadcast
| * | | | Add ActiveSupport::Notifications hook to Broadcaster#broadcastMatthew Wear2016-05-123-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | This addition of this notification hook will give users better visibility into the messages being sent over the PubSub adapter.
* | | | | Merge pull request #25030 from mmmpa/pull_requestMatthew Draper2016-07-042-1/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | | ActionCable, sometimes add_channel is not called.
| * | | | Add guard to broadcast.mmmpa2016-05-262-1/+22
| | | | |
* | | | | Merge pull request #25241 from aguynamedben/fix-touch-error-messagesRichard Schneeman2016-07-032-2/+12
|\ \ \ \ \ | | | | | | | | | | | | Improve error message when record touch fails.
| * | | | | Improve error message when record touch fails.Ben Standefer2016-07-022-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current error message only indicates that a touch can fail because the record is new. In practice, we saw cases where touches were failing because the record had been destroyed. `persisted?` checks `new_record?` *and* `destroyed?`. It was confusing to get a message about a new record when in reality we were destroying records. I also included a helpful tip for users to consider using `persisted?`, `new_record?`, or `destroyed?` before touching.
* | | | | | Merge pull request #25661 from will-in-wi/clarify_postgres_docsVipul A M2016-07-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify Postgres initials. [skip ci]
| * | | | | | Clarify Postgres initials. [skip ci]William Johnston2016-07-021-2/+2
|/ / / / / /
* | | | | | Merge pull request #25658 from will-in-wi/fix_rails_5_attributes_docsVipul A M2016-07-021-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update Rails 5 release notes with syntax fixes. [ci skip]
| * | | | | Update Rails 5 release notes with syntax fixes.William Johnston2016-07-021-3/+4
|/ / / / /
* | | | | Merge pull request #25657 from htanata/fix_typoVipul A M2016-07-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo: accidently -> accidentally. [ci skip]
| * | | | | Fix typo: accidently -> accidentally.Hendy Tanata2016-07-021-1/+1
|/ / / / /
* | | | | Merge pull request #25293 from y-yagi/remove_needless_commentsMatthew Draper2016-07-033-5/+0
|\ \ \ \ \ | | | | | | | | | | | | remove needless comments
| * | | | | remove needless commentsyuuji.yaginuma2016-06-063-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to #25240.
* | | | | | Merge pull request #25647 from aditya-kapoor/correct-guide-commandVipul A M2016-07-021-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correct guide generation command [ci skip]
| * | | | | | Correct guide generation command [ci skip]Aditya Kapoor2016-07-021-3/+3
| | | | | | |
* | | | | | | Merge pull request #25638 from kamipo/remove_unused_predicate_builderSean Griffin2016-07-023-19/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused `predicate_builder` for `BasicObjectHandler` and `RangeHandler`
| * | | | | | | Remove unused `predicate_builder` for `BasicObjectHandler` and `RangeHandler`Ryuta Kamizono2016-07-023-19/+3
| | | | | | | |
* | | | | | | | Merge pull request #25644 from Edouard-chin/forgotten-doc-removalVipul A M2016-07-021-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | `partial` option on the digest method is no more needed [ci skip]:
| * | | | | | | | `partial` option on the digest method is no more needed [ci skip]:Edouard CHIN2016-07-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `partial` option is not used anymore, this was removed in https://github.com/rails/rails/pull/23724
* | | | | | | | | Merge pull request #25646 from y-yagi/refer_to_rails_command_instead_of_rakeVipul A M2016-07-021-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | refer to rails command instead of rake in doc of `SourceAnnotationExtractor`
| * | | | | | | | refer to rails command instead of rake in doc of `SourceAnnotationExtractor` ↵yuuji.yaginuma2016-07-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #25222 from vipulnsward/25219-fix-logsMatthew Draper2016-07-023-9/+29
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Clean backtrace in IRB
| * | | | | | | | - Added test for verifying that we treat line number indications from irb as ↵Vipul A M2016-07-011-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user/lib code - Cleaned up backtrace cleaner test code and removed instaces variables
| * | | | | | | | Fixes #25219Vipul A M2016-07-012-1/+13
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Add handling of cleaning up backtrace from IRB console in case of errors
* | | | | | | | Try the newest bundlerRafael Mendonça França2016-07-021-4/+0
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #25639 from y-yagi/followup_to_25431Rafael França2016-07-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix task name to remove
| * | | | | | | fix task name to removeyuuji.yaginuma2016-07-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to #25431
* | | | | | | Merge pull request #25507 from ↵Rafael França2016-07-023-14/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bquorning/optimize-for-first-result-and-remove-mysql-select_one Remove #select_one from Mysql2Adapter
| * | | | | | | Optimize ActiveRecord::Result#lastBenjamin Quorning2016-06-242-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you only want the last element of a result set, there's no need to create all of hash_rows. Also, add a test.
| * | | | | | | Remove MySQL::DatabaseStatements#select_oneBenjamin Quorning2016-06-241-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation from abstract/database_statements.rb seems to work just fine. And with ActiveRecord::Result now implementing an optimized #first method, the performance concerns previously addressed in https://github.com/rails/rails/commit/bf79aa4fc14aeb2646331e767038acf0b77e9e7f should not be an issue.
| * | | | | | | Add ActiveRecord::Result#firstBenjamin Quorning2016-06-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you only need the first element of a result set, you shouldn't need to instantiate all of hash_rows.
* | | | | | | | Merge pull request #24177 from vipulnsward/rename-testRafael França2016-07-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Renamed NestedParametersTest to NestedParametersPermitTest
| * | | | | | | | - Renamed NestedParametersTest to NestedParametersPermitTest, to indicate ↵Vipul A M2016-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | what we are actually testing in this file
* | | | | | | | | Merge pull request #25631 from yahonda/revert_rename_to_ar_internal_metadataRafael França2016-07-012-28/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Rename `active_record_internal_metadatas` to `ar_internal_metadata"
| * | | | | | | | | Revert "Rename `active_record_internal_metadatas` to `ar_internal_metadata`"Yasuo Honda2016-07-012-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 407e0ab5e5cddf6a8b6b278b12f50772d13b4d86.
* | | | | | | | | | Merge pull request #25633 from kamipo/remove_create_table_info_cacheRafael França2016-07-011-6/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove `create_table_info_cache` because it not be reused
| * | | | | | | | | | Remove `create_table_info_cache` because it not be reusedRyuta Kamizono2016-07-021-6/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create_table_info_cache` is used for sharing `create_table_info` both `table_options` and `foreign_keys`. But `foreign_keys` no longer uses `create_table_info_cache` by #25307. No need caching anymore.