aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci ckip] Fix example of resolve in CHANGELOG.mdAndrew White2017-02-251-1/+1
|
* Fix typo `HashWithIndifferentAcces` to `HashWithIndifferentAccess` [ci skip]Ryuta Kamizono2017-02-251-1/+1
|
* Order array contents to match Relation#firstMatthew Draper2017-02-251-1/+1
|
* Merge pull request #28137 from schneems/schneems/fix-default-puma-portRichard Schneeman2017-02-242-11/+52
|\ | | | | [close #24435] Send user_supplied_options to server
| * [close #24435] Send user_supplied_options to serverschneems2017-02-242-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when Puma gets a `:Port` it doesn't know if it is Rails' default port or if it is one that is specified by a user. Because of this it assumes that the port passed in is always a user defined port and therefor 3000 always "wins" even if you specify `port` inside of the `config/puma.rb` file when booting your server with `rails s`. The fix is to record the options that are explicitly passed in from the user and pass those to the Puma server (or all servers really). Puma then has enough information to know when `:Port` is the default and when it is user defined. I went ahead and did this for all values rails server exposes as server side options for completeness. The hardest thing was converting the input say `-p` or `--port` into the appropriate "name", in this case `Port`. There may be a more straightforward way to do this with Thor, but I'm not an expert here. Move logic for parsing user options to method Better variable name for iteration Explicitly test `--port` user input ✂️ Update array if environment variables are used
* | Use shasum 256 on the releaseRafael Mendonça França2017-02-241-2/+2
| |
* | Merge branch 'jhawthorn-ruby_2_4_bigdecimal_casting'Rafael Mendonça França2017-02-244-1/+24
|\ \ | | | | | | | | | Closes #27429
| * | Match the behavior of bigdecimal after ↵Rafael Mendonça França2017-02-241-1/+5
| | | | | | | | | | | | https://github.com/ruby/bigdecimal/pull/55
| * | Fix invalid string Decimal casting under ruby 2.4John Hawthorn2017-02-244-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, BigDecimal(), as used by the Decimal cast, was changed so that it will raise ArgumentError when passed an invalid string, in order to be more consistent with Integer(), Float(), etc. The other numeric types use ex. to_i and to_f. Unfortunately, we can't simply change BigDecimal() to to_d. String#to_d raises errors like BigDecimal(), unlike all the other to_* methods (this should probably be filed as a ruby bug). Instead, this simulates the existing behaviour and the behaviour of the other to_* methods by finding a numeric string at the start of the passed in value, and parsing that using BigDecimal(). See also https://bugs.ruby-lang.org/issues/10286 https://github.com/ruby/bigdecimal/commit/3081a627cebdc1fc119425c7a9f009dbb6bec8e8
* | | Merge pull request #28157 from robin850/hwia-soft-deprecationMatthew Draper2017-02-255-3/+57
|\ \ \ | |/ / |/| | | | | Soft-deprecate the `HashWithIndifferentAccess` constant
| * | Add few tests for the top level `HashWithIndifferentAccess`Robin Dupret2017-02-251-0/+24
| | | | | | | | | | | | | | | This ensures that if we try to hard-deprecate it again in the future, we won't break these behaviors.
| * | Soft-deprecate the top-level HashWithIndifferentAccess classRobin Dupret2017-02-255-3/+34
| | | | | | | | | | | | | | | | | | | | | Since using a `ActiveSupport::Deprecation::DeprecatedConstantProxy` would prevent people from inheriting this class and extending it from the `ActiveSupport::HashWithIndifferentAccess` one would break the ancestors chain, that's the best option we have here.
* | | Merge pull request #28006 from fareastside/masterRafael Mendonça França2017-02-243-2/+21
|\ \ \ | | | | | | | | | | | | Allow ActiveSupport::MarshalWithAutoloading#load to take a Proc
| * | | add optional second argument to ActiveSupport core extension for ↵Jeff Latz2017-02-243-2/+21
| |/ / | | | | | | | | | Marshal#load so it can take a proc
* | | Fix CHANGELOG entry position [ci skip]Rafael Mendonça França2017-02-241-2/+3
| | |
* | | Merge pull request #28158 from dylanahsmith/gzip-crc-checkRafael França2017-02-244-2/+16
|\ \ \ | |/ / |/| | Add missing gzip footer check in ActiveSupport::Gzip.decompress
| * | Add missing gzip footer check in ActiveSupport::Gzip.decompressDylan Thacker-Smith2017-02-244-2/+16
|/ / | | | | | | | | | | | | | | A gzip file has a checksum and length for the decompressed data in its footer which isn't checked by just calling Zlib::GzipReader#read. Calling Zlib::GzipReader#close must be called after reading to the end of the file causes this check to be done, which is done by Zlib::GzipReader.wrap after its block is called.
* | Merge pull request #28144 from lucasmazza/lm-system-test-driven-byEileen M. Uchitelle2017-02-244-27/+35
|\ \ | | | | | | Change `SystemTestCase.driven_by` to use `setup`/`teardown` hooks
| * | Change `SystemTestCase.driven_by` to use `setup`/`teardown` hooksLucas Mazza2017-02-244-27/+35
| | | | | | | | | | | | | | | | | | Previously, `driven_by` would change the Capybara configuration when the test case is loaded, and having multiple test classes with different `driven_by` configs would fail as the last loaded would be effective.
* | | Merge pull request #28150 from ↵Rafael França2017-02-242-0/+10
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/do_not_display_hidden_namespaces_in_generators_help does not show hidden namespaces in generator's help
| * | | does not show hidden namespaces in generator's helpyuuji.yaginuma2017-02-242-0/+10
| | | |
* | | | Merge pull request #28062 from ↵Rafael França2017-02-242-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/make_adding_gemfile_entry_work_even_if_specify_only_the_plugin_name Make adding gemfile entry work even if specify only the plugin name
| * | | | Make adding gemfile entry work even if specify only the plugin nameyuuji.yaginuma2017-02-242-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whether the command was executed within the rails application is checked by whether or not the application's path matches `app_path`. https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/plugin/plugin_generator.rb#L439..L441 Therefore, if only plugin name is specified in `app_path`, addition to Gemfile is not done. However, in the rails guide an example of specifying only plugin name is given, and it is considered that there are many cases where only plugin name is specified. For that reason, made it work even if only plugin name was specified.
* | | | | Merge pull request #28145 from treiff/update-docs-ActiveRecord__ResultRafael França2017-02-241-1/+12
|\ \ \ \ \ | |_|/ / / |/| | | | Improve docs for ActiveRecord::Result. [ci skip]
| * | | | Improve docs for ActiveRecord::Result. [ci skip]Trevor Reiff2017-02-241-1/+12
| | |/ / | |/| | | | | | | | | | Remove styling from `true` and `false`.
* | | | Merge pull request #28141 from y-yagi/show_correct_help_and_versionRafael França2017-02-233-2/+49
|\ \ \ \ | | | | | | | | | | Make version and help short-cut alias to work
| * | | | Make help short-cut alias to workyuuji.yaginuma2017-02-242-1/+24
| | | | |
| * | | | Make version short-cut alias to workyuuji.yaginuma2017-02-242-1/+25
| | | | |
* | | | | Merge pull request #27769 from maclover7/jm-jruby-amoRafael França2017-02-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Enable Active Model testing for JRuby
| * | | | | Enable Active Model testing for JRubyJon Moss2017-02-231-1/+1
| | | | | |
* | | | | | Merge pull request #28138 from rwz/rwz/hwia-compactRichard Schneeman2017-02-232-1/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Make HWIA#compact not return nil when no nils
| * | | | | Make HWIA#compact not return nil when no nilsPavel Pravosud2017-02-232-1/+11
| |/ / / /
* | | | | Make security policy more prominent in docsJon Moss2017-02-232-0/+7
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #25285 from ↵Rafael França2017-02-232-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_remove_reference_to_multiple_foreign_keys_in_the_same_table Fix `remove_reference` to multiple foreign keys in the same table
| * | | | | Fix `remove_reference` to multiple foreign keys in the same tableRyuta Kamizono2017-02-112-0/+17
| | | | | |
* | | | | | Merge pull request #27962 from kamipo/deprecate_quoted_idRafael França2017-02-237-60/+111
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Deprecate using `#quoted_id` in quoting / type casting
| * | | | | Deprecate using `#quoted_id` in quotingRyuta Kamizono2017-02-245-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally `quoted_id` was used in legacy quoting mechanism. Now we use type casting mechanism for that. Let's deprecate `quoted_id`.
| * | | | | Fix type casting AR object to respect the primary key cast type's serializationRyuta Kamizono2017-02-242-2/+40
| | | | | |
| * | | | | Extract `TypeCastingTest` into `test/cases/quoting_test.rb`Ryuta Kamizono2017-02-243-52/+56
| | | | | |
* | | | | | Merge pull request #28022 from spk/guides-validationRafael França2017-02-231-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix w3c_validator.rb validation script
| * | | | | Fix w3c_validator.rb validation scriptLaurent Arnoud2017-02-231-4/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #26559 from kamipo/fix_wait_timeout_as_stringRafael França2017-02-233-2/+25
|\ \ \ \ \ | | | | | | | | | | | | Fix `wait_timeout` to configurable for mysql2 adapter
| * | | | | Fix `wait_timeout` to configurable for mysql2 adapterRyuta Kamizono2017-02-243-2/+25
| |/ / / / | | | | | | | | | | | | | | | Fixes #26556.
* | | | | Merge pull request #28112 from bolek/include-job_id-in-all-active-job-logsRafael França2017-02-232-8/+8
|\ \ \ \ \ | |/ / / / |/| | | | Include JobID in all ActiveJob info logs
| * | | | Include JobID in all ActiveJob info logsBolek Kurowski2017-02-222-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we provide the Job ID in logs only related to enqueuing a job. This adds the job id to the remaining ActiveJob logs when: - a job started performing - a job ended performing Providing the job id in those logs will ease searching logs by job id.
* | | | | Rearrange npm release process againMatthew Draper2017-02-231-42/+41
| | | | | | | | | | | | | | | | | | | | Make prep_release idempotent, including the npm bump.
* | | | | Add a task to build a draft of the release announcementMatthew Draper2017-02-231-0/+69
| | | | |
* | | | | Do not override the global variableRafael Mendonça França2017-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | This will make the version of the next gems to change
* | | | | Update package.jsonRafael Mendonça França2017-02-232-2/+2
| | | | |
* | | | | Preparing for 5.1.0.beta1 releaseRafael Mendonça França2017-02-2322-44/+66
| | | | |