aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #26003 from darkbaby123/fix_xhr_overwrite_headers_in_testKasper Timm Hansen2016-08-073-4/+26
|\ \ \ | |/ / |/| | Fix Accept header overwritten issue when "xhr: true" in integration test
| * | Fix Accept header overridden when "xhr: true" in integration testDavid Chen2016-08-073-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In integration test when specify the "Accept" header with "xhr: true" option, the Accept header is overridden with a default xhr Accept header. The issue only affects HTTP header "Accept" but not CGI variable "HTTP_ACCEPT". For example: get '/page', headers: { 'Accept' => 'application/json' }, xhr: true # This is WRONG! And the response.content_type is also affected. # It should be "application/json" assert_equal "text/javascript, text/html, ...", request.accept assert_equal 'text/html', response.content_type The issue is in `ActionDispatch::Integration::RequestHelpers`. When setting "xhr: true" the helper sets a default HTTP_ACCEPT if blank. But the code doesn't consider supporting both HTTP header style and CGI variable style. For detail see this GitHub issue: https://github.com/rails/rails/issues/25859
* | | Merge pull request #26076 from yui-knk/privatize_expandKasper Timm Hansen2016-08-071-10/+10
|\ \ \ | | | | | | | | `ActiveRecord::PredicateBuilder#expand` to be private
| * | | `ActiveRecord::PredicateBuilder#expand` to be privateyui-knk2016-08-071-10/+10
| | | | | | | | | | | | | | | | This method is not touched from outside.
* | | | Merge pull request #24260 from ↵Kasper Timm Hansen2016-08-072-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/show_error_message_when_error_raised_in_rails_runner show error message when error raised in rails runner
| * | | | show error message when error raised in rails runneryuuji.yaginuma2016-08-032-5/+9
| | | | |
* | | | | Defer requiring Rake until it's needed.Kasper Timm Hansen2016-08-071-1/+8
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Eagerly requiring Rake could put 100ms on to the Rails boot time. Shimmy that down to 0 by requiring Rake when no native Rails command exists and we try to run a Rake task. Or when printing all the Rake commands through `rails help`. Fixes #25029
* | | | Fix a typoVijay Dev2016-08-071-1/+1
| | | |
* | | | Merge pull request #26077 from kamipo/add_stype_empty_linesXavier Noria2016-08-0776-90/+4
|\ \ \ \ | |_|/ / |/| | | Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
| * | | Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty linesRyuta Kamizono2016-08-0776-90/+4
|/ / /
* | | Merge pull request #26073 from kamipo/revert_passing_splat_binds_for_arel_nodeSean Griffin2016-08-064-13/+11
|\ \ \ | | | | | | | | Revert passing arel node with splat binds for `where`
| * | | Revert passing arel node with splat binds for `where`Ryuta Kamizono2016-08-062-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing arel node with splat binds for `where` was introduced at #22877 for uniqueness validator supports prepared statement. But I'd not like to introduce the following usage: ```ruby Foo.where(arel, *binds) ``` I'd like to revert this internal usage.
| * | | Don't passing a nil value to `case_sensitive_comparison`Ryuta Kamizono2016-08-063-13/+9
| | | | | | | | | | | | | | | | | | | | A `value` is only used for checking `value.nil?`. It is unnecessary if immediately return when `value.nil?`.
* | | | Merge pull request #26060 from siong1987/minor/puma-configGuillermo Iguaran2016-08-061-1/+1
|\ \ \ \ | | | | | | | | | | .to_i is unnecessary for puma threads.
| * | | | .to_i is unnecessary.Teng Siong Ong2016-08-041-1/+1
| | |_|/ | |/| |
* | | | applies remaining conventions across the projectXavier Noria2016-08-06261-664/+434
| | | |
* | | | normalizes indentation and whitespace across the projectXavier Noria2016-08-06463-11661/+11638
| | | |
* | | | remove redundant curlies from hash argumentsXavier Noria2016-08-06100-563/+486
| | | |
* | | | modernizes hash syntax in the rest of the projectXavier Noria2016-08-063-16/+16
| | | |
* | | | modernizes hash syntax in guidesXavier Noria2016-08-065-11/+11
| | | |
* | | | modernizes hash syntax in railtiesXavier Noria2016-08-068-29/+29
| | | |
* | | | modernizes hash syntax in activesupportXavier Noria2016-08-0657-1040/+1040
| | | |
* | | | modernizes hash syntax in activerecordXavier Noria2016-08-06202-2408/+2404
| | | |
* | | | modernizes hash syntax in activemodelXavier Noria2016-08-064-7/+7
| | | |
* | | | modernizes hash syntax in activejobXavier Noria2016-08-063-12/+12
| | | |
* | | | modernizes hash syntax in actionviewXavier Noria2016-08-0668-1123/+1123
| | | |
* | | | modernizes hash syntax in actionpackXavier Noria2016-08-0695-2062/+2062
| | | |
* | | | modernizes hash syntax in actioncableXavier Noria2016-08-061-2/+2
| | | |
* | | | applies new string literal convention to the rest of the projectXavier Noria2016-08-0615-149/+149
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in the gemspecsXavier Noria2016-08-0610-166/+166
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in GemfileXavier Noria2016-08-061-61/+61
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in toolsXavier Noria2016-08-063-19/+19
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in tasksXavier Noria2016-08-061-24/+24
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in guidesXavier Noria2016-08-0615-160/+160
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in ciXavier Noria2016-08-061-38/+38
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in railties/testXavier Noria2016-08-0695-1595/+1595
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in railties/libXavier Noria2016-08-06105-628/+628
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actioncable/testXavier Noria2016-08-0629-260/+260
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actioncable/libXavier Noria2016-08-0628-90/+90
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actionmailer/testXavier Noria2016-08-0617-257/+257
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actionmailer/libXavier Noria2016-08-0615-47/+47
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actionpack/testXavier Noria2016-08-06145-6003/+6003
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actionpack/libXavier Noria2016-08-0696-571/+571
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actionview/testXavier Noria2016-08-0657-1207/+1207
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in actionview/libXavier Noria2016-08-0655-271/+271
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in activejob/testXavier Noria2016-08-0647-279/+279
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in activejob/libXavier Noria2016-08-0628-99/+99
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in activemodel/testXavier Noria2016-08-0638-563/+563
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in activemodel/libXavier Noria2016-08-0628-77/+77
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | | applies new string literal convention in activerecord/testXavier Noria2016-08-06280-5678/+5678
| | | | | | | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:25:52 +0000