aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reinstate railties tests on Ruby 1.8.7Andrew White2016-11-031-8/+1
| | | | | Something changed in Bundler 1.12.0 that caused the railties tests to start failing so lock the bundler version to 1.11.2.
* Fix method redefined warnings for + and - on TimeAndrew White2016-11-031-3/+4
| | | | | | | | | The power_assert gem has a workaround for a Ruby 2.3 bug[1] which causes method refined warnings with operator methods on Time. Work around the workaround by loading Active Support time extensions before loading the test-unit gem. [1]: https://bugs.ruby-lang.org/issues/11182
* Tweak conditionals on YAML handlingAndrew White2016-11-031-2/+2
| | | | | There's no YAML::ENGINE constant in Ruby 1.8 and Ruby 2.2+ but the former still needs to use the deprecated Syck behavior.
* Adjust tests for differences between Ruby 1.8 and 1.9Andrew White2016-11-034-18/+25
| | | | | Ruby 1.9 added Hash#select! and return a hash from Hash#select whereas Ruby 1.8 returned an array.
* Update travis.yml to match master where appropriateAndrew White2016-11-031-19/+27
|
* Cache bundle install on TravisAndrew White2016-11-031-0/+3
|
* Start memcached for Action Pack and Active Support testsAndrew White2016-11-031-0/+3
|
* The pg gem has started requiring Ruby 2.0+ from 0.19.0Andrew White2016-11-031-0/+2
|
* Flushing all logs fixed in Ruby 2.3Andrew White2016-11-031-2/+2
| | | | | | Previously, flushing all logs in Ruby 2.0 and later would raise an exception when there was no DATABASE_URL or database.yml. Whatever was the cause of that seems to have been fixed in Ruby 2.3.
* Remove migration constants to avoid method redefined warningsAndrew White2016-11-031-0/+4
|
* Remove unused local variableAndrew White2016-11-031-1/+0
|
* Fix uninitialized warning with @new_record instance variableAndrew White2016-11-031-0/+1
| | | | | Initializing @stale_state to nil when an association is built fixes a marshalling error - see #5268 for more details.
* Fix indentingAndrew White2016-11-021-6/+6
|
* Only override to_yaml if YAML::ENGINE is definedAndrew White2016-11-021-14/+16
| | | | | The Syck engine has been removed from later versions of Ruby so no need to override to_yaml for these versions.
* Fix File.exists? deprecation warnings in Active RecordAndrew White2016-11-024-21/+21
|
* Fix raising uniqueness constraints in newer versions of SQLiteAndrew White2016-11-021-1/+5
| | | | | Versions 3.8.2 and later of SQLite changed the formatting of the error messages returned when a uniqueness constraint was violated.
* Fix deprecation warnings on URI.unescapeAndrew White2016-11-021-1/+2
|
* Remove duplicate prompt key from optionsAndrew White2016-11-021-1/+1
|
* Double assign locals to avoid unused variables warningAndrew White2016-11-021-1/+2
|
* Fix File.exists? deprecation warnings in Action PackAndrew White2016-11-022-2/+2
|
* Fix inconsistencies in path with missing helpersAndrew White2016-11-022-2/+18
| | | | | | Ruby 2.0 and later demonstrate some inconsistencies when a helper file is not found with the path method on LoadError. By creating a subclass of LoadError we can cater for the inconsistencies.
* Fix method redefinition warnings in i18n gemAndrew White2016-11-021-0/+4
| | | | | | The i18n gem adds its own copies of deep_merge, except and slice if they haven't been defined so require them early to prevent any method redefinition warnings from appearing.
* Fix AS::HWIA#select and #reject on Ruby 2.1.1+Andrew White2016-11-022-0/+44
| | | | | | In Ruby 2.1.1 and later select and reject return a new instance of Hash rather than the subclass so we need to override them to return an instance of the correct class.
* Fix warning about unset I18n.enforce_available_localesAndrew White2016-11-026-0/+18
|
* Fix warning with ambiguous *argsAndrew White2016-11-021-1/+1
|
* Fix AS::OrderHash#select and #reject on Ruby 2.1.1+Andrew White2016-11-022-0/+18
| | | | | | In Ruby 2.1.1 and later select and reject return a new instance of Hash rather than the subclass so we need to override them to return an instance of the correct class.
* Ruby 2.0 added LoadError#pathAndrew White2016-11-021-6/+8
|
* Relax dependency of builder gemAndrew White2016-11-022-2/+2
|
* Use later versions of nokogiri on 1.9.3+Andrew White2016-11-021-1/+6
|
* Fix File.exists? deprecation warnings in Active SupportAndrew White2016-11-022-2/+2
|
* Only list json gem once in GemfileAndrew White2016-11-021-2/+4
| | | | | | Bundler gives a warning if you have a gem listed more than once in your Gemfile. Even though they were in different platform blocks it's better to combine them in case it causes a problem later.
* Prefer https over git for securityAndrew White2016-11-021-2/+2
|
* Add Ruby 2.3 to test matrixAndrew White2016-11-021-0/+1
|
* bumping versionAaron Patterson2016-09-149-9/+9
|
* Merge pull request #26495 from johnnyshields/fix-3-2-specsRafael França2016-09-144-10/+40
|\ | | | | [WIP] Fix tests for 3-2-stable
| * Fix failing tests on 3-2-stable branch:Johnny Shields2016-09-154-10/+40
|/ | | | | | | | - Set sudo: false in .travis.yml which uses latest travis engine and fixes some failing specs - Use older version of gems in Gemfile if RUBY_VERSION < '1.9.3' (no change to .gemspec) - Fix two cases of hash rockets in tests (required for Ruby 1.8.7) - Skip failing test "test_ensure_that_migration_tasks_work_with_mountable_option" which breaks due to Bundler no longer accepting the default generated .gemspec format. - Skip railties specs on Ruby 1.8.7 (mark as an allowed failure.)
* adds a couple of missing requiresXavier Noria2016-08-222-0/+3
|
* Merge pull request #26131 from smellsblue/dont-fail-on-non-stringRafael França2016-08-122-2/+9
|\ | | | | Remove dead code and ensure values are strings before calling gsub
| * Remove dead code and ensure values are strings before calling gsubMike Virata-Stone2016-08-112-2/+9
|/
* Merge branch '3-2-22-3' into 3-2-stableAaron Patterson2016-08-1110-9/+10
|\ | | | | | | | | | | * 3-2-22-3: bumping version Include missing module in tag_helper
| * bumping versionAaron Patterson2016-08-119-9/+9
| |
| * Include missing module in tag_helperCarlos Antonio da Silva2016-08-111-0/+1
| | | | | | | | | | | | | | | | | | Since 6857415187810f1289068a448268264d0cf0844f we are using #safe_join to join the content when an Array is given, so we must include the dependent module here to make sure it's available when this module is used alone. This was making Simple Form tests to fail with current master due to the missing dependency.
* | Merge branch '3-2-22-3' into 3-2-stableAaron Patterson2016-08-1111-13/+30
|\| | | | | | | | | | | * 3-2-22-3: bumping version ensure tag/content_tag escapes " in attribute vals
| * bumping versionAaron Patterson2016-08-109-9/+9
| |
| * ensure tag/content_tag escapes " in attribute valsAndrew Carpenter2016-08-102-4/+21
| | | | | | | | | | | | Many helpers mark content as HTML-safe without escaping double quotes -- including `sanitize`. Regardless of whether or not the attribute values are HTML-escaped, we want to be sure they don't include double quotes, as that can cause XSS issues. For example: `content_tag(:div, "foo", title: sanitize('" onmouseover="alert(1);//'))` CVE-2016-6316
* | Merge pull request #25043 from tlrdstd/support_ruby_2_3Rafael França2016-05-204-3/+9
|\ \ | | | | | | Associations do not call `.to_proc` on Hash
| * | Associations do not call `.to_proc` on HashTyler Distad2016-05-164-3/+9
|/ / | | | | | | Fixes #25010
* | update rendering commentArthur Neves2016-03-141-1/+1
| | | | | | | | [skip ci]
* | Require hash_with_indifferent_access before using itRafael Mendonça França2016-03-081-0/+2
| |
* | fix 1.8 hash syntaxArthur Neves2016-03-011-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 09:26:31 +0000