aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-countRafael Mendonça França2015-04-081-1/+1
|\ | | | | A shorter and more concise version of select..size
| * A shorter and more concise version of select..sizeTan Le2015-04-091-1/+1
| |
* | Disable Active Job intregration tests.Rafael Mendonça França2015-04-081-0/+1
| | | | | | | | They may be fixed at #19470
* | Merge pull request #19685 from vngrs/actionview_parent_layout_bugRafael Mendonça França2015-04-082-8/+31
|\ \ | | | | | | fix for actionview parent layout bug
| * | fix for actionview parent layout bugMehmet Emin İNAÇ2015-04-082-8/+31
| | | | | | | | | | | | | | | | | | | | | This commit fixes issue #19626 Don't need to check layout conditions if there is no condition test for parent layout bug fix
* | | Merge pull request #19633 from y00rb/sort_router_parameters_duplicated_keysRafael Mendonça França2015-04-084-2/+42
|\ \ \ | | | | | | | | avoid error when sort mixture keys in symbol and string
| * | | sort_by instead of sortYang Bo2015-04-084-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | it is avoid sort errot within different and mixed keys. used `sort_by` + `block` to list parameter by keys. keep minimum changes
* | | | Merge pull request #19694 from eagletmt/file-store-clearRafael Mendonça França2015-04-082-0/+7
|\ \ \ \ | | | | | | | | | | Allow AS::Cache::FileStore#clear without cache directory
| * | | | Allow AS::Cache::FileStore#clear without cache directoryKohei Suzuki2015-04-092-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `Rails.cache.clear` raises Errno::ENOENT if it's run just after cloning a new Rails project. It should succeed without removing files or directories.
* | | | | Merge pull request #19698 from stemps/masterRafael Mendonça França2015-04-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix documentation for SchemaStatements#add_foreign_key
| * | | | | fix documentation for SchemaStatements#add_foreign_keySimon Stemplinger2015-04-081-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of the generation of the foreign key name was changed between Rails 4.2.0 and 4.2.1 from a random to a deterministic behavior, however the documentation still describes the old randomized behavior.
* | | | | Merge pull request #19324 from arthurnn/batch_touchArthur Nogueira Neves2015-04-087-7/+172
|\ \ \ \ \ | | | | | | | | | | | | Batch touch parent records
| * | | | | Batch touch parent recordsArthur Neves2015-04-087-7/+172
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [fixes #18606] Make belongs_to use touch over touch_later when running the callbacks. Add more tests and small method rename Thanks Jeremy for the feedback.
* | | | | Merge branch 'fix_uniqueness_validation_when_value_is_out_of_range'Sean Griffin2015-04-083-0/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix uniqueness validation with out of range valueAndrey Voronkov2015-04-083-0/+31
|/ / / /
* | | | Avoid to define an initializer after the load_config_initializersRafael Mendonça França2015-04-073-8/+9
| | | | | | | | | | | | | | | | | | | | This make the config/initializers run before the railties are loaded what can break some configurations.
* | | | Merge pull request #19677 from ↵schneems2015-04-071-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | treble37/update-docs-ActionDispatch__Request__Session.create-for-pr added docs for ActionDispatch::Request::Session#create
| * | | | remove new line between doc and methodBruce Park2015-04-071-1/+0
| | | | |
| * | | | added docs for ActionDispatch::Request::Session#createBruce Park2015-04-071-1/+3
| | | | |
* | | | | Merge pull request #19680 from vngrs/make_join_model_name_const_privateRafael Mendonça França2015-04-071-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Change join model name constant to private constant
| * | | | | Change join model name constant to private constantMehmet Emin İNAÇ2015-04-071-3/+1
| | |_|/ / | |/| | | | | | | | | | | | | This will resolve the fixme message which is about making constant invisible.
* | | | | Merge pull request #17574 from kamipo/charset_collation_optionsJeremy Kemper2015-04-078-19/+172
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Add charset and collation options support for MySQL string and text columns.
| * | | | Add `:charset` and `:collation` options support for MySQL string and text ↵Ryuta Kamizono2015-03-068-19/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | columns Example: create_table :foos do |t| t.string :string_utf8_bin, charset: 'utf8', collation: 'utf8_bin' t.text :text_ascii, charset: 'ascii' end
* | | | | Merge pull request #19661 from Azdaroth/fields-for-child-index-lambdaRafael Mendonça França2015-04-063-1/+26
|\ \ \ \ \ | | | | | | | | | | | | Accept lambda as child_index option in #fields_for method
| * | | | | Accept lambda as child_index option in #fields_for methodKarol Galanciak2015-04-053-1/+26
| | | | | |
* | | | | | Merge pull request #19647 from codeout/association_updateRafael Mendonça França2015-04-062-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a regression introduced by removing unnecessary db call when replacing
| * | | | | | Fix a regression introduced by removing unnecessary db call when replacingShintaro Kojima2015-04-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When replacing a has_many association with the same one, there is nothing to do with database but a setter method should still return the substituted value for backward compatibility.
* | | | | | | Merge pull request #19029 from iainbeeston/skipping-undefined-callbacksRafael Mendonça França2015-04-064-15/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Raise ArgumentError if an unrecognised callback is skipped
| * | | | | | | Raise ArgumentError if an unrecognised callback is skippedIain Beeston2015-04-034-15/+46
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, if you skip a callback that hasn't been defined, activesupport callbacks silently does nothing. However, it's easy to mistype the name of a callback and mistakenly think that it's being skipped, when it is not. This problem even exists in the current test suite. CallbacksTest::SkipCallbacksTest#test_skip_person attempts to skip callbacks that were never set up. This PR changes `skip_callback` to raise an `ArgumentError` if the specified callback cannot be found.
* | | | | | | Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_runRafael Mendonça França2015-04-068-33/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix AS::Callbacks raising an error when `:run` callback is defined.
| * | | | | | | Revert "Reduce allocations when running AR callbacks."Guo Xiang Tan2015-03-228-33/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 796cab45561fce268aa74e6587cdb9cae3bb243e.
* | | | | | | | No need to document drop_table in the PostgreSQLAdapterRafael Mendonça França2015-04-063-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It behaves in the same way that the abstract adapter. [ci skip]
* | | | | | | | Merge pull request #19671 from nishantmodak/patch-1Rafael Mendonça França2015-04-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix URL rails-framework-hooks
| * | | | | | | | Fix URL rails-framework-hooksNishant Modak2015-04-071-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #19668 from y-yagi/notes_default_dirRafael Mendonça França2015-04-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | correct the directory which rake notes look by default [ci skip]
| * | | | | | | | correct the directory which rake notes look by default [ci skip]yuuji.yaginuma2015-04-061-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #19670 from vngrs/misspell_of_existKasper Timm Hansen2015-04-062-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | correct spell of exist [ci skip]
| * | | | | | | change the explanation of :if_exists option [ci skip]Mehmet Emin İNAÇ2015-04-062-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #19667 from vngrs/drop_table_docSantiago Pastorino2015-04-062-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | drop_table method documentation for mysql and postgresql adapters [ci skip]
| * | | | | | | drop_table method documentation for mysql and postgresql adapters [ci skip]Mehmet Emin İNAÇ2015-04-062-0/+19
| | | | | | | |
* | | | | | | | Merge pull request #19666 from mikej/masterSantiago Pastorino2015-04-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix missing "if" in API docs for ActionController::Parameters#permit
| * | | | | | | | fix missing "if" in API docs for ActionController::Parameters#permitMichael Josephson2015-04-061-1/+1
| |/ / / / / / /
* | | | | | | | Fix ActionPack tests after changes to missing template loggereileencodes2015-04-062-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merging #19377 ActionPack tests were missing a require for `ActiveSupport::LogSubscriber::TestHelper` and change didn't take into account that logger could be nil. Added the require and only log to info if logger exists. This wasn't caught earlier because these tests only run after a merge.
* | | | | | | | Merge pull request #19665 from eileencodes/fix-parse_query-method-signatureEileen M. Uchitelle2015-04-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix method signature of `parse_query` to match rack
| * | | | | | | Fix method signature of `parse_query` to match rackeileencodes2015-04-061-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently rack was changed to have a second argument on the `parse_query` method (in rack/rack#781). Rails relies on this and it's `parse_query` method was complaining about missing the second argument. I changed the arguments to `*` so we don't have this issue in the future.
* | | | | | | Merge pull request #19377 from sb8244/issue-19036David Heinemeier Hansson2015-04-064-8/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | when a template is missing for the default render, do head no_content instead
| * | | | | | | head no_content when there is no template or action performedStephen Bussey2015-04-054-8/+31
| |/ / / / / /
* | | | | | | Merge pull request #19652 from vngrs/pluralize_foreign_key_table_name_bugYves Senn2015-04-064-2/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use singular table name if pluralize_table_names is setted as false whil...
| * | | | | | | use singular table name if pluralize_table_names is setted as false while ↵Mehmet Emin İNAÇ2015-04-063-2/+27
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating foreign key test case for use singular table name if pluralize_table_names is setted as false while creating foreign key refactor references foreign key addition tests use singular table name while removing foreign key merge foreign key singular table name methods remove unnecessary drop table from test
* | | | | | | Merge pull request #19662 from yui-knk/fix/bindMatthew Draper2015-04-061-47/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ci skip] Remove Extensions to `Proc` section
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 01:16:01 +0000