aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #19685 from vngrs/actionview_parent_layout_bugRafael Mendonça França2015-04-082-8/+31
|\ \ \ \ \ \
| * | | | | | fix for actionview parent layout bugMehmet Emin İNAÇ2015-04-082-8/+31
* | | | | | | Merge pull request #19633 from y00rb/sort_router_parameters_duplicated_keysRafael Mendonça França2015-04-084-2/+42
|\ \ \ \ \ \ \
| * | | | | | | sort_by instead of sortYang Bo2015-04-084-2/+42
* | | | | | | | Merge pull request #19694 from eagletmt/file-store-clearRafael Mendonça França2015-04-082-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow AS::Cache::FileStore#clear without cache directoryKohei Suzuki2015-04-092-0/+7
* | | | | | | | | Merge pull request #19698 from stemps/masterRafael Mendonça França2015-04-081-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix documentation for SchemaStatements#add_foreign_keySimon Stemplinger2015-04-081-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19324 from arthurnn/batch_touchArthur Nogueira Neves2015-04-087-7/+172
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Batch touch parent recordsArthur Neves2015-04-087-7/+172
|/ / / / / / / / /
* | | | | | | | | 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
* | | | | | | | Merge pull request #19677 from treble37/update-docs-ActionDispatch__Request__...schneems2015-04-071-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 constantMehmet Emin İNAÇ2015-04-071-3/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | 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 col...Ryuta Kamizono2015-03-068-19/+172
* | | | | | | | | 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 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 replacingShintaro Kojima2015-04-042-0/+4
* | | | | | | | | | Merge pull request #19029 from iainbeeston/skipping-undefined-callbacksRafael Mendonça França2015-04-064-15/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Raise ArgumentError if an unrecognised callback is skippedIain Beeston2015-04-034-15/+46
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_runRafael Mendonça França2015-04-068-33/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Reduce allocations when running AR callbacks."Guo Xiang Tan2015-03-228-33/+24
* | | | | | | | | | | No need to document drop_table in the PostgreSQLAdapterRafael Mendonça França2015-04-063-9/+8
* | | | | | | | | | | Merge pull request #19671 from nishantmodak/patch-1Rafael Mendonça França2015-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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]yuuji.yaginuma2015-04-061-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #19670 from vngrs/misspell_of_existKasper Timm Hansen2015-04-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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]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#permitMichael Josephson2015-04-061-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Fix ActionPack tests after changes to missing template loggereileencodes2015-04-062-1/+2
* | | | | | | | | | | 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 rackeileencodes2015-04-061-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #19377 from sb8244/issue-19036David Heinemeier Hansson2015-04-064-8/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 while cre...Mehmet Emin İNAÇ2015-04-063-2/+27
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #19662 from yui-knk/fix/bindMatthew Draper2015-04-061-47/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Remove Extensions to `Proc` chapter sectionyui-knk2015-04-061-47/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19657 from smadeja/guides-updateYves Senn2015-04-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update command_tasks source codeSzymon Madeja2015-04-051-1/+1