Remove sqlite3 lines from .gitignore if the application is not using sqlite3.
Merge pull request #14447 from Houdini/gitignore

Skip sqlite3 files in .gitignore if no sqlite3 in app
Check if any sqlite files are not included in the gitignore

If the sqlite file name change in future version we this regexp should
catch
- Rename `increment_or_decrement` to an apt `set_cache_value` since it actually doesn't increment/decrement in localstore.
Fix date_select option overwriting html classes

with_css_classes: true option overwrites other html classes.
Concatenate day month and year classes rather than overwriting.
Merge pull request #14468 from izoomi/date_select_helper

Fix date_select with_css_classes: true option overwriting other html classes
Merge pull request #14466 from vipulnsward/rename-cache-method

Rename method and stop passing unused arguements.
use ARel factory methods for building AST nodes

This abstracts us from the actual construction of the nodes
do not rely on method_missing hitting arel

arel methods are not supposed to be public API for ActiveRecord
synchronize changelogs and 4.1 release notes. [ci skip]

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
update comments to reflect that options support is not available
Merge pull request #14477 from fcheung/options_test_method

Support the options methods in tests
Fix Generation of proper migration when
  ActiveRecord::Base.pluralize_table_names = false.

  Previously, generation a migration like this:

      rails g migration add_column_name_to_user name

  would not generating the correct table name.

Fixes #13426.
Merge pull request #13440 from kuldeepaggarwal/pluralize_table_name_issue

Generating proper migration when ActiveRecord::Base.pluralize_table_names = false
clarify CHANGELOG [ci skip].