aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19716 from yui-knk/fix/filter_nameZachary Scott2015-04-091-3/+3
|\ | | | | [ci skip] Downcases filter names
| * [ci skip] Downcases filter namesyui-knk2015-04-101-3/+3
|/
* Merge pull request #19689 from marutosi/master-issue-19187Rafael Mendonça França2015-04-095-4/+39
|\ | | | | | | | | [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on Windows
| * [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on ↵Toshi MARUYAMA2015-04-092-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows * https://github.com/rails/rails/issues/19187 * https://github.com/rails/rails/pull/19533 * https://github.com/macournoyer/thin/issues/268 These are serious Rails 4 regression for Redmine Bitnami Windows users. https://community.bitnami.com/t/problems-with-3-0-1-installation-see-report-inside/30195/ It is not caused on webrick users. Related: * https://github.com/rack/rack/issues/732#issuecomment-67677272 * https://github.com/phusion/passenger/issues/1328
| * wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rbToshi MARUYAMA2015-04-091-1/+5
| | | | | | | | | | | | Related: #19617, #19187, #19533, #19689, #19675. 'drb/unix' does not exist on mingw.
| * Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on LinuxToshi MARUYAMA2015-04-092-2/+11
|/ | | | | | | Related: #19617, #19187, #19533, #19689, #19675. This is POC (Proof Of Concept) which bundler does not remove mingw lines. https://github.com/rails/rails/pull/19617#issuecomment-90293795
* Merge pull request #19712 from eliotsykes/active-job-config-guideRafael Mendonça França2015-04-092-0/+60
|\ | | | | Add Active Job to Configuring Guide [ci skip]
| * Add Active Job to Configuring Guide [ci skip]Eliot Sykes2015-04-092-0/+60
| |
* | Merge pull request #19682 from ↵Rafael Mendonça França2015-04-093-3/+31
|\ \ | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error Fix fails to force_ssl_redirection if session_store is disabled
| * | fix fails to force_ssl_redirection if session_store is disabledTaishi Kasuga2015-04-093-3/+31
| | |
* | | Merge pull request #19703 from vizcay/fix_code_staticsRafael Mendonça França2015-04-092-4/+22
|\ \ \ | |_|/ |/| | bugfix CodeStatics#calculate_directory_statics when dir has source ext
| * | bugfix CodeStatics#calculate_directory_statics when dir has source extensionPablo Vizcay2015-04-092-4/+22
| |/
* / redcarpet 3.2.2 has an XSS vulnerabilityAkira Matsuda2015-04-092-3/+3
|/ | | | see: http://www.openwall.com/lists/oss-security/2015/04/07/11
* 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]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 04:04:52 +0000